Date: Sun, 2 Feb 2003 08:46:28 -0800 From: Michael Haro <mharo@FreeBSD.org> To: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> Cc: ports@FreeBSD.org Subject: Re: portlint ignoring $PORTSDIR Message-ID: <20030202164628.GA6806@netmug4.netmug.org> In-Reply-To: <Pine.BSF.4.51.0302012108160.32942@acrux.dbai.tuwien.ac.at> References: <Pine.BSF.4.51.0302011140460.66277@acrux.dbai.tuwien.ac.at> <Pine.BSF.4.51.0302012108160.32942@acrux.dbai.tuwien.ac.at>
next in thread | previous in thread | raw e-mail | index | archive | help
Go ahead and commit this.
Michael
On Sat, Feb 01, 2003 at 09:12:14PM +0100, Gerald Pfeifer wrote:
> Here is patch which solves this "bug" (well, lack of feature, to be
> honest).
>
> On Sat, 1 Feb 2003, Gerald Pfeifer wrote:
> > I have PORTSDIR set, and a full checkout of our ports collection there:
> >
> > % echo $PORTSDIR/
> > /sw/FreeBSD/ports/
> >
> > % ls $PORTSDIR/Mk/bsd.sites.mk
> > /sw/FreeBSD/ports/Mk/bsd.sites.mk
> >
> > However, portlint simply ignores $PORTSDIR and tries to access
> > /usr/ports/Mk -- which does not exist on this host:
> >
> > /sw/FreeBSD/ports/emulators/wine% portlint
> > /usr/ports/Mk/bsd.sites.mk: No such file or directory at /usr/local/bin/portlint line 211.
> >
> > IMnsHO portlint should exclusively use $PORTSDIR if that has been set, and
> > never fall back to /usr/ports in that case.
>
> May I apply it?
>
> Gerald (gerald@FreeBSD.org)
>
> Index: src/portlint.pl
> ===================================================================
> RCS file: /sw/FreeBSD/CVSUP/ports/devel/portlint/src/portlint.pl,v
> retrieving revision 1.32
> diff -u -3 -p -r1.32 portlint.pl
> --- src/portlint.pl 11 Jan 2003 08:18:48 -0000 1.32
> +++ src/portlint.pl 1 Feb 2003 19:52:51 -0000
> @@ -135,6 +135,10 @@ foreach my $i (@osdep) {
> last;
> }
> }
> +
> +# The PORTSDIR environment variable overrides our defaults.
> +$portsdir = $ENV{PORTSDIR} if ( defined $ENV{'PORTSDIR'} );
> +
> if ($verbose) {
> print "OK: config: portsdir: \"$portsdir\" ".
> "rcsidstr: \"$rcsidstr\" ".
> Index: src/portlint.1
> ===================================================================
> RCS file: /sw/FreeBSD/CVSUP/ports/devel/portlint/src/portlint.1,v
> retrieving revision 1.8
> diff -u -3 -p -r1.8 portlint.1
> --- src/portlint.1 18 Nov 2002 02:37:30 -0000 1.8
> +++ src/portlint.1 1 Feb 2003 20:06:16 -0000
> @@ -125,14 +125,18 @@ on
> .Ox
> .Pc
> .It Pa /usr/ports/*
> -port collection
> +ports collection
> .Po
> .Pa /usr/pkgsrc/*
> on
> .Nx
> /
> .Ox
> -.Pc
> +.Pc ;
> +can be overriden by setting the
> +.Va PORTSDIR
> +environment variable.
> +
> .Sh AUTHORS
> .An Michael Haro Aq mharo@FreeBSD.org
> .An Jun-ichiro Hagino Aq itojun@itojun.org
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030202164628.GA6806>