aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-03-26 20:43:13 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-03-26 20:43:13 +0000
commit6ab42818d76bce58bb1dde5f68e8dd2f401f833a (patch)
treed0bb3d8b0da4810ba21369f044d84dbe7653f463 /ports-mgmt
parent0a36889426591e0b773af1cff045692ed35a2432 (diff)
downloadports-6ab42818d76bce58bb1dde5f68e8dd2f401f833a.tar.gz
ports-6ab42818d76bce58bb1dde5f68e8dd2f401f833a.zip
Notes
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portlint/Makefile2
-rw-r--r--ports-mgmt/portlint/src/portlint.pl62
2 files changed, 52 insertions, 12 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 809b4852e6fa..ee68a6f92ed9 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -8,7 +8,7 @@
#
PORTNAME= portlint
-PORTVERSION= 2.5.9
+PORTVERSION= 2.6.0
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index f89fc2352050..74d0e4216c57 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.43 2004/03/21 07:31:33 marcus Exp $
+# $Id: portlint.pl,v 1.44 2004/03/26 20:42:32 marcus Exp $
#
use vars qw/ $opt_a $opt_A $opt_b $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
@@ -39,8 +39,8 @@ $portdir = '.';
# version variables
my $major = 2;
-my $minor = 5;
-my $micro = 9;
+my $minor = 6;
+my $micro = 0;
sub l { '[{(]'; }
sub r { '[)}]'; }
@@ -250,12 +250,13 @@ close(IN);
#
# check for files.
#
-my @checker = ($makevar{DESCR}, 'Makefile', $makevar{MD5_FILE});
+my @checker = ($makevar{DESCR}, 'Makefile', 'distinfo', $makevar{MD5_FILE});
my %checker = (
- $makevar{DESCR} => 'checkdescr',
- 'Makefile' => 'checkmakefile',
- $makevar{MD5_FILE} => 'TRUE'
- );
+ $makevar{DESCR} => 'checkdescr',
+ 'Makefile' => 'checkmakefile',
+ $makevar{MD5_FILE} => 'TRUE',
+ 'distinfo' => 'checkdistinfo',
+);
if ($extrafile) {
my @files = (
<$makevar{SCRIPTDIR}/*>,
@@ -493,6 +494,24 @@ if ($err || $warn) {
exit $err;
#
+# distinfo
+#
+sub checkdistinfo {
+ my($file) = @_;
+ my($sizefound) = 0;
+ open(IN, "< $file") || return 0;
+ while (<IN>) {
+ if ($_ =~ /^SIZE/) {
+ $sizefound = 1;
+ }
+ }
+ if (!$sizefound) {
+ &perror("WARN: $file: does not contain SIZE.");
+ }
+ close(IN);
+}
+
+#
# pkg-descr
#
sub checkdescr {
@@ -693,7 +712,7 @@ sub checkplist {
if ($_ =~ /^info\/dir$/) {
&perror("FATAL: $file [$.]: \"info/dir\" should not be listed.".
- "use install-info to add/remove ".
+ "Use install-info to add/remove ".
"an entry.");
$infooverwrite++;
}
@@ -1016,18 +1035,20 @@ sub checkmakefile {
print "OK: checking for USE_* used too late.\n" if ($verbose);
my @use_early = qw(
APACHE
+ BZIP2
GNUSTEP
IMAKE
JAVA
KDE(?:BASE|LIBS)_VER
- LIBRUBY
+ (?:LIB)?RUBY
LINUX_PREFIX
OPENSSL
+ PHP
PYTHON
QT2?
QT_VER
- RUBY
X_PREFIX
+ ZIP
);
my @other_early = qw(
@@ -1070,6 +1091,16 @@ sub checkmakefile {
}
#
+ # whole file: USE_SIZE
+ #
+ print "OK: checking USE_SIZE.\n" if ($verbose);
+ if ($whole =~ /\nUSE_SIZE/) {
+ my $lineno = &linenumber($`);
+ &perror("WARN: $file [$lineno]: use of USE_SIZE is no longer ".
+ "required.");
+ }
+
+ #
# whole file: MACHINE_ARCH
#
print "OK: checking MACHINE_ARCH.\n" if ($verbose);
@@ -1115,6 +1146,15 @@ sub checkmakefile {
}
#
+ # whole file: check for USE_GETTEXT
+ #
+ print "OK: checking for USE_GETTEXT without WITHOUT_NLS.\n" if ($verbose);
+ if ($whole =~ /\nUSE_GETTEXT/ && $whole !~ /def(?:ined)?\s*\(?WITHOUT_NLS\)?/) {
+ &perror("WARN: $file: Consider adding support for a WITHOUT_NLS ".
+ "knob to conditionally disable gettext support.");
+ }
+
+ #
# whole file: direct use of command names
#
my %cmdnames = ();