Date: Thu, 23 Jun 2011 03:30:52 +0000 From: Alexey Dokuchaev <danfe@FreeBSD.org> To: "Ilya A. Arkhipov" <micro@heavennet.ru> Cc: Chris Rees <crees@freebsd.org>, ports@freebsd.org, Ion-Mihai Tetcu <itetcu@freebsd.org>, Joe Marcus Clarke <marcus@freebsd.org>, kwm@freebsd.org Subject: Re: portlint(1) knobs order: let's make things more logical Message-ID: <20110623033052.GA23118@FreeBSD.org> In-Reply-To: <BANLkTim%2B46u3H9tUp-EqS1PKKtfKZ2KQTw@mail.gmail.com> References: <20110621214013.6cc4760e@heavennet.ru> <20110622020048.GA83940@FreeBSD.org> <BANLkTi=En%2B7nJgEmKCmBEQMwiV0nbcPhEg@mail.gmail.com> <20110622064224.GB94185@FreeBSD.org> <BANLkTi=s6zYOJJv6%2Bkk%2Bttd7jadmTuaT6w@mail.gmail.com> <20110622160233.8b6156e1.itetcu@FreeBSD.org> <20110622135941.GA99725@FreeBSD.org> <e645505a-06bd-461d-b4a6-3f4436caef24@email.android.com> <BANLkTim%2B46u3H9tUp-EqS1PKKtfKZ2KQTw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--AqsLC8rIMeq19msA Content-Type: text/plain; charset=koi8-r Content-Disposition: inline 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 --AqsLC8rIMeq19msA Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename="pl.diff" 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]; --AqsLC8rIMeq19msA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110623033052.GA23118>