mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

Don't check for DISTVERSION as apart of %makevars since it will be set

Browse Source 
internally when PORTVERSION is set.  Instead, just scour the Makefile to
see if both PORTVERSION and DISTVERSION are defined.

Reported by:	krion
This commit is contained in:
Joe Marcus Clarke 2004-12-17 17:25:32 +00:00
parent 4751b2ef6a
commit 1ecef33045
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=124319
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devel/portlint/Makefile
View File

@ -9,6 +9,7 @@
PORTNAME= portlint
PORTVERSION= 2.6.10
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none

12
devel/portlint/src/portlint.pl
View File

@ -17,7 +17,7 @@
# OpenBSD and NetBSD will be accepted.
#
# $FreeBSD$
# $Id: portlint.pl,v 1.70 2004/12/17 03:45:23 marcus Exp $
# $Id: portlint.pl,v 1.71 2004/12/17 17:23:52 marcus Exp $
#
use vars qw/ $opt_a $opt_A $opt_b $opt_C $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
@ -1466,7 +1466,7 @@ DIST_SUBDIR EXTRACT_ONLY
# check the items that has to be there.
$tmp = "\n" . $tmp;
print "OK: checking PORTNAME/PORTVERSION.\n" if ($verbose);
print "OK: checking PORTNAME/PORTVERSION/DISTVERSION.\n" if ($verbose);
if ($tmp !~ /\nPORTNAME(.)?=/) {
&perror("FATAL: $file: PORTNAME has to be there.") unless ($slaveport && $makevar{PORTNAME} ne '');
} elsif ($1 ne '') {
@ -1479,6 +1479,10 @@ DIST_SUBDIR EXTRACT_ONLY
&perror("WARN: $file: unless this is a master port, PORTVERSION has to be set by \"=\", ".
"not by \"$2=\".") unless ($masterport);
}
if ($tmp =~ /\nPORTVERSION.?=/ && $tmp =~ /\nDISTVERSION.?=/) {
&perror("FATAL: $file: either PORTVERSION or DISTVERSION must be ".
"specified, not both.");
}
if ($newport) {
print "OK: checking for existence of PORTREVISION in new port.\n"
if ($verbose);
@ -1654,10 +1658,6 @@ DIST_SUBDIR EXTRACT_ONLY
if ($portversion eq '' && $distversion eq '') {
&perror("FATAL: $file: either PORTVERSION or DISTVERSION must be specified");
}
if ($portversion ne '' && $distversion ne '') {
&perror("FATAL: $file: either PORTVERSION or DISTVERSION must be ".
"specified, not both");
}
if ($portversion =~ /^pl[0-9]*$/
|| $portversion =~ /^[0-9]*[A-Za-z]?[0-9]*(\.[0-9]*[A-Za-z]?[0-9+]*)*$/) {
print "OK: PORTVERSION \"$portversion\" looks fine.\n" if ($verbose);

1
ports-mgmt/portlint/Makefile
View File

@ -9,6 +9,7 @@
PORTNAME= portlint
PORTVERSION= 2.6.10
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none

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

@ -17,7 +17,7 @@
# OpenBSD and NetBSD will be accepted.
#
# $FreeBSD$
# $Id: portlint.pl,v 1.70 2004/12/17 03:45:23 marcus Exp $
# $Id: portlint.pl,v 1.71 2004/12/17 17:23:52 marcus Exp $
#
use vars qw/ $opt_a $opt_A $opt_b $opt_C $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
@ -1466,7 +1466,7 @@ DIST_SUBDIR EXTRACT_ONLY
# check the items that has to be there.
$tmp = "\n" . $tmp;
print "OK: checking PORTNAME/PORTVERSION.\n" if ($verbose);
print "OK: checking PORTNAME/PORTVERSION/DISTVERSION.\n" if ($verbose);
if ($tmp !~ /\nPORTNAME(.)?=/) {
&perror("FATAL: $file: PORTNAME has to be there.") unless ($slaveport && $makevar{PORTNAME} ne '');
} elsif ($1 ne '') {
@ -1479,6 +1479,10 @@ DIST_SUBDIR EXTRACT_ONLY
&perror("WARN: $file: unless this is a master port, PORTVERSION has to be set by \"=\", ".
"not by \"$2=\".") unless ($masterport);
}
if ($tmp =~ /\nPORTVERSION.?=/ && $tmp =~ /\nDISTVERSION.?=/) {
&perror("FATAL: $file: either PORTVERSION or DISTVERSION must be ".
"specified, not both.");
}
if ($newport) {
print "OK: checking for existence of PORTREVISION in new port.\n"
if ($verbose);
@ -1654,10 +1658,6 @@ DIST_SUBDIR EXTRACT_ONLY
if ($portversion eq '' && $distversion eq '') {
&perror("FATAL: $file: either PORTVERSION or DISTVERSION must be specified");
}
if ($portversion ne '' && $distversion ne '') {
&perror("FATAL: $file: either PORTVERSION or DISTVERSION must be ".
"specified, not both");
}
if ($portversion =~ /^pl[0-9]*$/
|| $portversion =~ /^[0-9]*[A-Za-z]?[0-9]*(\.[0-9]*[A-Za-z]?[0-9+]*)*$/) {
print "OK: PORTVERSION \"$portversion\" looks fine.\n" if ($verbose);