cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version to 2.18.1.

Browse Source 
Soften the py-* dependency error around flavors.

Now the message is a warning and a suggestion. This is pending more discussion,
but this seems like a good compromise for now.

PR:		225654
Requested by:	antoine
This commit is contained in:
Joe Marcus Clarke 2018-05-12 18:59:07 +00:00
parent 4c99d3f3ac
commit ef15aa321e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=469754
2 changed files with 7 additions and 7 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.18.0
PORTVERSION= 2.18.1
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

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

@ -15,7 +15,7 @@
# was removed.
#
# $FreeBSD$
# $MCom: portlint/portlint.pl,v 1.459 2018/05/11 21:26:56 jclarke Exp $
# $MCom: portlint/portlint.pl,v 1.461 2018/05/12 18:55:45 jclarke Exp $
#
use strict;
@ -50,7 +50,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 18;
my $micro = 0;
my $micro = 1;
# default setting - for FreeBSD
my $portsdir = '/usr/ports';
@ -1152,13 +1152,13 @@ sub check_depends_syntax {
$makevar{USE_PYTHON} eq 'noflavors' ||
$makevar{USE_PYTHON} eq '') {
if ($m{'fla'} ne '${PY_FLAVOR}') {
&perror("FATAL", $file, -1, "directory for dependency ".
"$m{'dep'} must be $m{'dir'}:\@\${PY_FLAVOR}");
&perror("WARN", $file, -1, "you may want directory for ".
"dependency $m{'dep'} to be $m{'dir'}:\@\${PY_FLAVOR}");
}
} else {
if ($m{'fla'} ne '${FLAVOR}') {
&perror("FATAL", $file, -1, "directory for dependency ".
"$m{'dep'} must be $m{'dir'}:\@\${FLAVOR}");
&perror("WARN", $file, -1, "you may want directory for ".
"dependency $m{'dep'} to be $m{'dir'}:\@\${FLAVOR}");
}
}
}