portlint(1) knobs order: let's make things more logical
Alexey Dokuchaev
danfe at FreeBSD.org
Thu Jun 23 03:30:53 UTC 2011
On Wed, Jun 22, 2011 at 11:39:54PM +0400, Ilya A. Arkhipov wrote:
> Hi danfe@
>
> http://micro.heavennet.ru/ports/portlint/portlint.patch
> please see it?
thanks, seems to work fine. I've beautified it a bit (see attach; sections
become badly numbered and some whitespace nits). marcus@ is CCed.
I'm not sure if we need to check/enforce any specific order of auxiliarly
LICENSE_ knobs (LICENSE_PERMS, LICENSE_GROUPS, LICENSE_NAME, LICENSE_FILE,
LICENSE_TEXT).
./danfe
-------------- next part --------------
Index: portlint.pl
===================================================================
RCS file: /home/danfe/fbsd/FreeBSD-CVS/ports/ports-mgmt/portlint/src/portlint.pl,v
retrieving revision 1.121
diff -u -r1.121 portlint.pl
--- portlint.pl 21 Mar 2011 01:00:11 -0000 1.121
+++ portlint.pl 23 Jun 2011 03:22:15 -0000
@@ -189,7 +189,7 @@
chdir "$portdir" || die "$portdir: $!";
# get make vars
-my @varlist = qw(
+my @varlist = qw(
PORTNAME PORTVERSION PORTREVISION PORTEPOCH PKGNAME PKGNAMEPREFIX
PKGNAMESUFFIX DISTVERSIONPREFIX DISTVERSION DISTVERSIONSUFFIX
DISTNAME DISTFILES CATEGORIES MASTERDIR MAINTAINER MASTER_SITES
@@ -2234,7 +2234,6 @@
}
#
- #
# section 2: PORTNAME/PORTVERSION/...
#
print "OK: checking first section of $file (PORTNAME/...).\n"
@@ -2761,9 +2760,25 @@
));
#
- # section 5: *_DEPENDS (may not be there)
+ # section 5: LICENSE
+ #
+ print "OK: checking fourth section of $file (LICENSE).\n"
+ if ($verbose);
+ $tmp = $sections[$idx++];
+
+ &checkearlier($file, $tmp, @varnames);
+ &checkorder('LICENSE', $tmp, $file, qw(
+LICENSE LICENSE_COMB
+ ));
+
+ push(@varnames, qw(
+LICENSE LICENSE_COMB
+ ));
+
+ #
+ # section 6: *_DEPENDS (may not be there)
#
- print "OK: checking fourth section of $file (*_DEPENDS).\n"
+ print "OK: checking fifth section of $file (*_DEPENDS).\n"
if ($verbose);
$tmp = $sections[$idx];
More information about the freebsd-ports
mailing list