aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-06-15 14:26:49 +0800
committermarcus <marcus@FreeBSD.org>2004-06-15 14:26:49 +0800
commitf4cc0cb2591d8c9106f4c74fef0d4231b9926436 (patch)
treee83ff032038dbe1065d633266b3afb2b786041a0 /ports-mgmt
parentf952e946c81e2cfe1393d46d620c664eb8af3f33 (diff)
downloadfreebsd-ports-gnome-f4cc0cb2591d8c9106f4c74fef0d4231b9926436.tar.gz
freebsd-ports-gnome-f4cc0cb2591d8c9106f4c74fef0d4231b9926436.tar.zst
freebsd-ports-gnome-f4cc0cb2591d8c9106f4c74fef0d4231b9926436.zip
Update to 2.6.5.
* Fix a bug introduced in the "use strict" conversion, and don't check patch files for trailing blank lines * Add a check to make sure pkg-config files are installed into the correct location [1] * Fix some nearby spacing nits Requested by: pav [1]
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portlint/Makefile2
-rw-r--r--ports-mgmt/portlint/src/portlint.pl14
2 files changed, 11 insertions, 5 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 4d7b6cf69847..27b6c420efd1 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -8,7 +8,7 @@
#
PORTNAME= portlint
-PORTVERSION= 2.6.4
+PORTVERSION= 2.6.5
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index 8e8b07fe1cf6..12e1b1fcd6f4 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.49 2004/06/06 17:02:32 marcus Exp $
+# $Id: portlint.pl,v 1.51 2004/06/15 06:23:42 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 /;
@@ -40,7 +40,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 6;
-my $micro = 4;
+my $micro = 5;
sub l { '[{(]'; }
sub r { '[)}]'; }
@@ -289,7 +289,7 @@ foreach my $i (@checker) {
} else {
my $proc = $checker{$i};
&$proc($i) || &perror("Cannot open the file $i\n");
- if ($proc ne 'checkpatch') {
+ if ($proc ne \&checkpatch) {
&checklastline($i)
|| &perror("Cannot open the file $i\n");
}
@@ -662,12 +662,18 @@ sub checkplist {
}
if ($_ =~ /\.la$/ && $makevar{USE_LIBTOOL_VER} eq '') {
- &perror("WARN: $file [$.]: installing libtool archives, ".
+ &perror("WARN: $file [$.]: installing libtool archives, ".
"please use USE_LIBTOOL_VER in Makefile if possible. ".
"See http://www.FreeBSD.org/gnome/docs/portlint.html ".
"for a way to completely eliminate .la files.");
}
+ if ($_ =~ m|^lib/pkgconfig/[^\.]+.pc$|) {
+ &perror("FATAL: $file [$.]: installing pkg-config files into ".
+ "lib/pkgconfig. All pkg-config files must be installed ".
+ "into libdata/pkgconfig for them to be found by pkg-config.");
+ }
+
if ($_ =~ m|^lib/lib[^\/]+\.so(\.\d+)?$| &&
$makevar{INSTALLS_SHLIB} eq '') {
&perror("WARN: $file [$.]: installing shared libraries, ".