Date: Mon, 04 Dec 2000 20:52:31 +0900 From: "Akinori MUSHA" <knu@iDaemons.org> To: Michael Haro <mharo@FreeBSD.org>, FreeBSD-ports <freebsd-ports@FreeBSD.org> Subject: portlint update Message-ID: <86u28kwghs.wl@archon.local.idaemons.org>
next in thread | raw e-mail | index | archive | help
Hi,
Please review and give me suggestion and approval to commit the
attached patch on portlint.
It makes portlint conform to the new layout, and adds a check for
INSTALLS_SHLIB. Currently pkg-* doesn't seem to be checked at all. :(
--
/
/__ __ Akinori.org / MUSHA.org
/ ) ) ) ) / FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp
"We're only at home when we're on the run, on the wing, on the fly"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/portlint/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile 2000/11/10 07:43:54 1.41
+++ Makefile 2000/12/04 11:06:39
@@ -8,7 +8,7 @@
#
PORTNAME= portlint
-PORTVERSION= 2.2.3.1
+PORTVERSION= 2.2.3.2
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none
Index: src/portlint.1
===================================================================
RCS file: /home/ncvs/ports/devel/portlint/src/portlint.1,v
retrieving revision 1.5
diff -u -r1.5 portlint.1
--- src/portlint.1 2000/04/25 21:33:42 1.5
+++ src/portlint.1 2000/12/04 11:36:35
@@ -38,7 +38,7 @@
Perform additional checks for extra files, such as
.Pa scripts/*
and
-.Pa pkg/* .
+.Pa pkg-* .
.It Fl b
Warn the use of
.Pa $(VARIABLE) .
Index: src/portlint.pl
===================================================================
RCS file: /home/ncvs/ports/devel/portlint/src/portlint.pl,v
retrieving revision 1.23
diff -u -r1.23 portlint.pl
--- src/portlint.pl 2000/11/10 07:20:43 1.23
+++ src/portlint.pl 2000/12/04 11:34:10
@@ -72,7 +72,7 @@
sub usage {
print STDERR <<EOF;
usage: $prog [-abctvN] [-B#] [port_directory]
- -a additional check for scripts/* and pkg/*
+ -a additional check for scripts/* and pkg-*
-b warn \$(VARIABLE)
-c committer mode
-v verbose mode
@@ -151,7 +151,7 @@
PORTNAME PORTVERSION PORTREVISION PORTEPOCH PKGNAME PKGNAMEPREFIX
PKGNAMESUFFIX DISTNAME DISTFILES CATEGORIES MASTERDIR MAINTAINER
MASTER_SITES WRKDIR WRKSRC NO_WRKSUBDIR PATCHDIR SCRIPTDIR FILESDIR
-PKGDIR COMMENT DESCR PLIST MD5_FILE .CURDIR
+PKGDIR COMMENT DESCR PLIST MD5_FILE .CURDIR INSTALLS_SHLIB
EOF
for (@varlist) {
@@ -347,11 +347,11 @@
my %checker = ($makevar{COMMENT}, 'checkdescr', $makevar{DESCR}, 'checkdescr',
'Makefile', 'checkmakefile', $makevar{MD5_FILE}, 'TRUE');
if ($extrafile) {
- foreach my $i ((<scripts/*>, <pkg/*>)) {
+ foreach my $i ((<scripts/*>, <pkg-*>)) {
next if (! -T $i);
next if (defined $checker{$i});
- if ($i =~ /pkg\/PLIST$/
- || ($multiplist && $i =~ /pkg\/PLIST/)) {
+ if ($i =~ /pkg-plist$/
+ || ($multiplist && $i =~ /pkg-plist/)) {
unshift(@checker, $i);
$checker{$i} = 'checkplist';
} else {
@@ -360,7 +360,7 @@
}
}
}
-foreach my $i (<patches/patch-??>) {
+foreach my $i (<files/patch-??>) {
next if (! -T $i);
next if (defined $checker{$i});
push(@checker, $i);
@@ -402,7 +402,7 @@
exit $err;
#
-# pkg/COMMENT, pkg/DESCR
+# pkg-comment, pkg-descr
#
sub checkdescr {
my($file) = @_;
@@ -434,7 +434,7 @@
"other local characters. $file should be ".
"plain ascii file.");
}
- if ($file =~ m/DESCR/ && $tmp =~ m,http://,) {
+ if ($file =~ m/pkg-descr/ && $tmp =~ m,http://,) {
my $has_url = 0;
my $has_www = 0;
foreach my $line (grep($_ =~ "http://", split(/\n+/, $tmp))) {
@@ -448,16 +448,16 @@
&perror("FATAL: $file: contains a URL but no WWW:");
}
}
- if ($file =~ m/COMMENT/) {
+ if ($file =~ m/pkg-comment/) {
if (($tmp !~ /^["0-9A-Z]/) || ($tmp =~ m/\.$/)) {
- &perror("WARN: pkg/COMMENT should begin with a capital, and end without a period");
+ &perror("WARN: pkg-comment should begin with a capital, and end without a period");
}
}
close(IN);
}
#
-# pkg/PLIST
+# pkg-plist
#
sub checkplist {
my($file) = @_;
@@ -511,12 +511,12 @@
} elsif ($_ =~ /^\@(comment)/) {
$rcsidseen++ if (/\$$rcsidstr[:\$]/);
} elsif ($_ =~ /^\@(owner|group)\s/) {
- &perror("WARN: \@$1 should not be needed in PLIST");
+ &perror("WARN: \@$1 should not be needed in pkg-plist");
} elsif ($_ =~ /^\@(dirrm|option)/) {
; # no check made
} else {
&perror("WARN: $file $.: ".
- "unknown PLIST directive \"$_\"");
+ "unknown pkg-plist directive \"$_\"");
}
next;
}
@@ -531,6 +531,11 @@
"please use USE_LIBTOOL in Makefile if possible");
}
+ if ($_ =~ /\.so(\.\d+)?$/ && $makevar{INSTALLS_SHLIB} eq '') {
+ &perror("WARN: $file $.: installing shared libraries, ".
+ "please define INSTALLS_SHLIB as appropriate");
+ }
+
if ($_ =~ /^info\/.*info(-[0-9]+)?$/) {
$infoseen = $.;
$infoafterinstall++ if ($infoinstallseen);
@@ -591,10 +596,10 @@
foreach my $if (@infofile) {
next if ($if =~ m/info-/);
if ($exec_install !~ m/\%D\/\Q$if\E/) {
- &perror("FATAL: you need an '\@exec install-info \%D/$if \%D/info/dir' line in your PLIST");
+ &perror("FATAL: you need an '\@exec install-info \%D/$if \%D/info/dir' line in your pkg-plist");
}
if ($unexec_install !~ m/\%D\/$if/) {
- &perror("FATAL: you need an '\@unexec install-info --delete \%D/$if \%D/info/dir' line in your PLIST");
+ &perror("FATAL: you need an '\@unexec install-info --delete \%D/$if \%D/info/dir' line in your pkg-plist");
}
}
@@ -1456,7 +1461,7 @@
# check MAN[1-9LN]
print "OK: checking MAN[0-9LN].\n" if ($verbose);
foreach my $i (keys %plistmanall) {
- print "OK: PLIST MAN$i=$plistmanall{$i}\n" if ($verbose);
+ print "OK: pkg-plist MAN$i=$plistmanall{$i}\n" if ($verbose);
}
foreach my $i (split(//, $manchapters)) {
if ($tmp =~ /MAN\U$i\E=\s*([^\n]*)\n/) {
@@ -1476,16 +1481,16 @@
&perror("FATAL: duplicated manpage ".
"entry $j: content of ".
"MAN$i will be automatically ".
- "added to PLIST.");
+ "added to pkg-plist.");
} elsif (!$automan && !grep($_ eq $j, @pman)) {
&perror("WARN: manpage $j in $file ".
- "MAN$i but not in PLIST.");
+ "MAN$i but not in pk-plist.");
}
}
foreach my $j (@pman) {
- print "OK: checking $j (PLIST)\n" if ($verbose);
+ print "OK: checking $j (pkg-plist)\n" if ($verbose);
if (!grep($_ eq $j, @mman)) {
- &perror("WARN: manpage $j in PLIST ".
+ &perror("WARN: manpage $j in pkg-plist ".
"but not in $file MAN$i.");
}
}
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86u28kwghs.wl>