diff options
| author | rillig <rillig@pkgsrc.org> | 2005-09-22 15:54:23 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-09-22 15:54:23 +0000 |
| commit | 103b53d3f65c25cec5639dc9d8fe6a11b8177b6b (patch) | |
| tree | 4c91979f7ab804549b75e6dd3c082d3a30a280b3 | |
| parent | 931f3b9e216636cec7564b831d9e586f1a1a7f88 (diff) | |
| download | pkgsrc-103b53d3f65c25cec5639dc9d8fe6a11b8177b6b.tar.gz | |
Updated pkglint to 4.21.3.
Fixed false positive errors for PHP packages.
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 48570fa05c7..41ef471cf42 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.11174 2005/09/22 15:38:01 tron Exp $ +$NetBSD: CHANGES,v 1.11175 2005/09/22 15:55:09 rillig Exp $ Changes to the packages collection and infrastructure in 2005: @@ -4085,3 +4085,4 @@ Changes to the packages collection and infrastructure in 2005: Updated lang/sablevm to 1.1.3nb7 [wiz 2005-09-22] Updated mail/mutt to 1.4.2.1nb4 [tron 2005-09-22] Updated news/inn to 2.4.1nb8 [tron 2005-09-22] + Updated pkgtools/pkglint to 4.21.3 [rillig 2005-09-22] diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 54c499ed658..913ef0f10a2 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.251 2005/09/22 11:56:37 rillig Exp $ +# $NetBSD: Makefile,v 1.252 2005/09/22 15:54:23 rillig Exp $ # -DISTNAME= pkglint-4.21.2 +DISTNAME= pkglint-4.21.3 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 09916afc708..01db76ab3b6 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,7 @@ # Freely redistributable. Absolutely no warranty. # # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp -# $NetBSD: pkglint.pl,v 1.285 2005/09/22 11:56:37 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.286 2005/09/22 15:54:23 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -1547,6 +1547,15 @@ sub load_package_Makefile($$$$$) { } } + # HACK + if ($whole !~ qr"\nUSE_PHP_EXT_PATCHES") { + $whole =~ s,\nPATCHDIR=.*PHPPKGSRCDIR.*,,; + } + # HACK + if ($whole =~ qr"\nPECL_VERSION") { + $whole =~ s,\nDISTINFO_FILE=.*PHPPKGSRCDIR.*,,; + } + $pkgdir = expand_variable($whole, "PKGDIR"); set_default_value(\$pkgdir, "."); $distinfo_file = expand_variable($whole, "DISTINFO_FILE"); |