Bug 196222 - ports-mgmt/portlint: update after Perl's hierarchy change
Summary: ports-mgmt/portlint: update after Perl's hierarchy change
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Joe Marcus Clarke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-12-23 01:56 UTC by Mathieu Arnold
Modified: 2015-02-04 17:11 UTC (History)
0 users

See Also:
marcus: maintainer-feedback+


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer freebsd_triage 2014-12-23 01:56:30 UTC
%%SITE_PERL%% now points to lib/perl5/site_perl, and %%PERL_ARCH%% to lib/perl5/site_perl/mach/PERL_VER


line 576, it says to replace lib/perl5/site_perl/%%PERL_VER%% with %%SITE_PERL%%, should remove the %%PERL_VER%% part, and maybe add a check for /mach/PERL_VER -> %%SITE_ARCH%%.

line 1961: it says to use ${SITE_PERL} instead of \${(?:LOCALBASE|PREFIX)}/lib/perl5/site_perl/\${PERL_VER} it is true for the LOCALBASE based one, but the PREFIX based one should be replace by ${PREFIX}/${SITE_PERL_REL}.
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2014-12-23 01:56:30 UTC
Auto-assigned to maintainer marcus@FreeBSD.org
Comment 2 Joe Marcus Clarke freebsd_committer freebsd_triage 2014-12-23 21:03:28 UTC
This look good to you?

http://www.marcuscom.com/cgi-bin/cvsweb.cgi/portlint/portlint.pl.diff?r1=1.344&r2=1.345&f=h
Comment 3 Mathieu Arnold freebsd_committer freebsd_triage 2014-12-23 21:15:29 UTC
(In reply to Joe Marcus Clarke from comment #2)
> This look good to you?
> 
> http://www.marcuscom.com/cgi-bin/cvsweb.cgi/portlint/portlint.pl.diff?r1=1.
> 344&r2=1.345&f=h

Maybe the first two could be swapped and the second be an else, no need to bug people about the path being bad twice if it's in PERL_ARCH as both will match.

For the second, SITE_PERL does not have PERL_VER in it any more, so it'd need to be removed, and maybe a SITE_ARCH version with /mach/PERL_VER added before it.

While I'm thinking of it, any reference to the ${STAGEDIR}${SITE_PERL} and ${STAGEDIR}${SITE_ARCH} is wrong and should be replaced by ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} and ${STAGEDIR}${PREFIX}/${SITE_BASE_REL} respectively, because SITE_PERL and SITE_ARCH are LOCALBASE based and LOCALBASE does not exist in the staging area, only PREFIX does.
Comment 4 Joe Marcus Clarke freebsd_committer freebsd_triage 2014-12-23 21:22:14 UTC
I'm not sure I follow.  I get what you're asking about the STAGE stuff, but I don't understand exactly what you're getting at about the SITE_PERL.  I don't have PERL_VER with SITE_PERL anymore.

Can you provide some pseudo-code at least to clarify?  Thanks.
Comment 5 Mathieu Arnold freebsd_committer freebsd_triage 2014-12-24 11:39:02 UTC
(In reply to Joe Marcus Clarke from comment #4)
> I'm not sure I follow.  I get what you're asking about the STAGE stuff, but
> I don't understand exactly what you're getting at about the SITE_PERL.  I
> don't have PERL_VER with SITE_PERL anymore.
> 
> Can you provide some pseudo-code at least to clarify?  Thanks.

You have :
         if ($j =~ m'\${(?:LOCALBASE|PREFIX)}/lib/perl5/site_perl/\${PERL_VER}') {

There is no .../site_perl/PERL_VER any more :

$ perl -V:sitelib -V:sitearch
sitelib='/usr/local/lib/perl5/site_perl';
sitearch='/usr/local/lib/perl5/site_perl/mach/5.18';

the first one is SITE_PERL, the second one is SITE_ARCH
Comment 6 Joe Marcus Clarke freebsd_committer freebsd_triage 2015-01-05 15:27:19 UTC
What about this:

http://www.marcuscom.com/cgi-bin/cvsweb.cgi/portlint/portlint.pl.diff?r1=1.348&r2=1.346&f=h

BTW, the other checks you mention are already there around line 1978.
Comment 7 Mathieu Arnold freebsd_committer freebsd_triage 2015-01-14 12:27:16 UTC
Yes, those look good, thanks :-)
Comment 8 Joe Marcus Clarke freebsd_committer freebsd_triage 2015-02-04 17:11:55 UTC
Changes committed, thanks!