aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-12-17 17:25:32 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-12-17 17:25:32 +0000
commit1ecef330453b6739ed50af0d35e2780bf84fcbe4 (patch)
treefc981f51715b44beb138b406b2dbe8c77c758967 /ports-mgmt
parent4751b2ef6aa57710cb5f605c9879b5197296d388 (diff)
downloadports-1ecef330453b6739ed50af0d35e2780bf84fcbe4.tar.gz
ports-1ecef330453b6739ed50af0d35e2780bf84fcbe4.zip
Notes
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portlint/Makefile1
-rw-r--r--ports-mgmt/portlint/src/portlint.pl12
2 files changed, 7 insertions, 6 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 5351e3292714..0ebea5cb272e 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -9,6 +9,7 @@
PORTNAME= portlint
PORTVERSION= 2.6.10
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index b10b0bb00d12..32d53e0578af 100644
--- a/ports-mgmt/portlint/src/portlint.pl
+++ b/ports-mgmt/portlint/src/portlint.pl
@@ -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);