mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

Update to 2.16.4

Browse Source 
* Correct a typo.  This should have been SITE_ARCH_REL. [1]
* Pre-populate USES with an explicit grep of the Makefile. [2]
* Correct a typo to prevent direct command usage checking in pkg-* files. [3]
* Adjust the order of first-paragraph items so that proper checking is done. [4]
* Adjust the warning about installing docs by wrapping with
  .if ${PORT_OPTIONS:MDOCS}. [5]
* Add a check for ${SETENV} instead of ${ENV}. [5]

PR:		199974 [2]
		199693 [3]
		199428 [4]
		199417 [5]
Submitted by:	adamw [4]
		sunpoet [1]
This commit is contained in:
Joe Marcus Clarke 2015-05-17 22:44:09 +00:00
parent ef2db094fa
commit 76df15a96d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=386646
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portlint/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= portlint
PORTVERSION= 2.16.3
PORTVERSION= 2.16.4
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

39
ports-mgmt/portlint/src/portlint.pl
View File

@ -15,7 +15,7 @@
# was removed.
#
# $FreeBSD$
# $MCom: portlint/portlint.pl,v 1.354 2015/04/13 04:48:55 jclarke Exp $
# $MCom: portlint/portlint.pl,v 1.361 2015/05/17 21:39:49 jclarke Exp $
#
use strict;
@ -50,7 +50,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 16;
my $micro = 3;
my $micro = 4;
# default setting - for FreeBSD
my $portsdir = '/usr/ports';
@ -213,6 +213,12 @@ while (<IN>) {
close(IN);
open(MK, 'Makefile') || die "Makefile: $!";
my @muses = grep($_ = /^USES[?+]?=\s*(.*)/ && $1, <MK>);
foreach my $muse (@muses) {
$makevar{USES} .= " " . $muse;
}
#
# check for files.
#
@ -1274,6 +1280,16 @@ sub checkmakefile {
"printed.");
}
#
# checking for use of ${ENV}
#
print "OK: checking for use of \${ENV} instead of \${SETENV}.\n" if ($verbose);
if ($whole =~ /\$\{ENV}/m) {
my $lineno = &linenumber($`);
&perror("WARN", $file, $lineno, "most uses of \${ENV} should really ".
"be \${SETENV} to avoid strange behaviors in sh(1).");
}
#
# whole file: use of :LU variable expansion modifiers
#
@ -1696,10 +1712,12 @@ sub checkmakefile {
}
if ($sharedocused && $whole !~ /defined\s*\(?NOPORTDOCS\)?/
&& $whole !~ /def\s*\(?NOPORTDOCS\)?/) {
if ($docsused == 0
if ($docsused == 1
&& $whole !~ m#(\$[\{\(]PREFIX[\}\)]|$localbase)/share/doc/#) {
&perror("WARN", $file, -1, "use \".if \${PORT_OPTIONS:MDOCS}\" to wrap ".
"installation of files into $localbase/share/doc.");
&perror("WARN", $file, -1, "you should only use \".if \${PORT_OPTIONS:MDOCS}\" to wrap ".
"installation of files into $localbase/share/doc if the".
" collection of files is large and it takes considerable time".
" to copy.");
}
} else {
$docsused++;
@ -1992,7 +2010,7 @@ xargs xmkmf
if ($j =~ m'\${STAGEDIR}\${SITE_ARCH}') {
my $lineno = &linenumber($`);
&perror("WARN", $file, $lineno, "\${STAGEDIR}\${SITE_ARCH} should be ".
"replaced by \${STAGEDIR}\${PREFIX}/\${SITE_BASE_REL}.");
"replaced by \${STAGEDIR}\${PREFIX}/\${SITE_ARCH_REL}.");
}
#
@ -2672,9 +2690,10 @@ DIST_SUBDIR EXTRACT_ONLY
}
push(@varnames, qw(
PORTNAME PORTVERSION PORTREVISION PORTEPOCH CATEGORIES MASTER_SITES
PKGNAMEPREFIX PKGNAMESUFFIX DISTNAME EXTRACT_SUFX
DISTFILES EXTRACT_ONLY
PORTNAME PORTVERSION DISTVERSIONPREFIX DISTVERSION DISTVERSIONSUFFIX
PORTREVISION PORTEPOCH CATEGORIES MASTER_SITES MASTER_SITE_SUBDIR
PROJECTHOST PKGNAMEPREFIX PKGNAMESUFFIX DISTNAME EXTRACT_SUFX DISTFILES
DIST_SUBDIR EXTRACT_ONLY
));
#
@ -3255,7 +3274,7 @@ work \${WRKDIR} instead
EOF
foreach my $i (keys %cmdnames) {
# use (?![\w-]) instead of \b to exclude pkg-*
if ($s =~ /^[^#]*(\.\/|\$[\{\(]\.CURDIR[\}\)]\/|[ \t])(\b$i)(?![\w-])/
if ($file =~ /^[^#]*(\.\/|\$[\{\(]\.CURDIR[\}\)]\/|[ \t])(\b$i)(?![\w-])/
&& $s !~ /^COMMENT(.)?=[^\n]+$i/m
&& $s !~ /^IGNORE(.)?=[^\n]+$i/m
&& $s !~ /^BROKEN(.)?=[^\n]+$i/m