diff options
| author | wiz <wiz> | 2002-04-08 13:57:12 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-04-08 13:57:12 +0000 |
| commit | 787c823324766f3c30c92df3a6e2258711b700f5 (patch) | |
| tree | adb2a2f159059ecded81a5a51d56c58e8878c2a7 /pkgtools | |
| parent | cdef0e073f7fa15d3318aa2de536e5c8c5508ac5 (diff) | |
| download | pkgsrc-787c823324766f3c30c92df3a6e2258711b700f5.tar.gz | |
Recognize ${INSTALL_INFO} in PLISTs as install-info.
Bump to 3.25.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 73d2f3b89a5..47529f1112a 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.128 2002/03/22 15:57:53 wiz Exp $ +# $NetBSD: Makefile,v 1.129 2002/04/08 13:57:12 wiz Exp $ # -DISTNAME= pkglint-3.24 +DISTNAME= pkglint-3.25 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 2bb84b41ada..df44dc9457a 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -12,7 +12,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.65 2002/02/27 11:20:59 abs Exp $ +# $NetBSD: pkglint.pl,v 1.66 2002/04/08 13:57:14 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -359,8 +359,12 @@ sub checkplist { "instead of \"\@unexec rmdir\"."); } elsif ($_ =~ /^\@exec[ \t]+(.*\/)?install-info/) { $infoinstallseen = $. + } elsif ($_ =~ /^\@exec[ \t]+(.*\/)?\$\{INSTALL_INFO\}/) { + $infoinstallseen = $. } elsif ($_ =~ /^\@unexec[ \t]+(.*\/)?install-info[ \t]+--delete/) { $inforemoveseen = $. + } elsif ($_ =~ /^\@unexec[ \t]+(.*\/)?\$\{INSTALL_INFO\}[ \t]+--delete/) { + $inforemoveseen = $. } elsif ($_ =~ /^\@(exec|unexec)/) { if (/ldconfig/ && !/\/usr\/bin\/true/) { |