diff options
| author | frueauf <frueauf@pkgsrc.org> | 1999-02-18 12:27:27 +0000 |
|---|---|---|
| committer | frueauf <frueauf@pkgsrc.org> | 1999-02-18 12:27:27 +0000 |
| commit | f534708d29e737adc860b9c117d92abc65191f30 (patch) | |
| tree | db3124e705fbf794e875357becc6f892ca3876b9 /pkgtools | |
| parent | b82401611dafed56be594495bc66e7f86353501f (diff) | |
| download | pkgsrc-f534708d29e737adc860b9c117d92abc65191f30.tar.gz | |
Reflect that we no longer enforce full path for install-info, bump
version to indicate change.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 8631b9c8773..1071bcd9cce 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 1998/11/26 14:23:47 frueauf Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/18 12:27:27 frueauf Exp $ # -DISTNAME= pkglint-1.67 +DISTNAME= pkglint-1.68 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty @@ -9,8 +9,6 @@ DISTFILES= # empty MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.netbsd.org/Documentation/netbsd/Packages.txt -CONFLICTS= pkglint-1.66 - USE_PERL5= YES EXTRACT_ONLY= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 02c3519354b..c0385290eb1 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.5 1998/11/17 17:19:23 agc Exp $ +# $NetBSD: pkglint.pl,v 1.6 1999/02/18 12:27:27 frueauf Exp $ # # This version contains some changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org> and @@ -275,12 +275,8 @@ sub checkplist { "instead of \"\@unexec rmdir\"."); } elsif ($_ =~ /^\@exec[ \t]+(.*\/)?install-info/) { $infoinstallseen = $. - if (($osname ne "NetBSD") || ("$1" eq "%D/bin/")); - # On NetBSD, we enforce %D/bin/... } elsif ($_ =~ /^\@unexec[ \t]+(.*\/)?install-info[ \t]+--delete/) { $inforemoveseen = $. - if (($osname ne "NetBSD") || ("$1" eq "%D/bin/")); - # On NetBSD, we enforce %D/bin/... } elsif ($_ =~ /^\@(exec|unexec)/) { if ($ldconfigwithtrue && /ldconfig/ @@ -368,21 +364,21 @@ sub checkplist { } if (!$infoinstallseen) { if ($infooverwrite) { - &perror("FATAL: \"\@exec ".(($osname eq "NetBSD")?"%D/bin/":"")."install-info must be used to ". - "add/delete entries into \"info/dir\"."); + &perror("FATAL: \"\@exec install-info\" must be used ". + "to add/delete entries into \"info/dir\"."); } - &perror("FATAL: \"\@exec ".(($osname eq "NetBSD")?"%D/bin/":"")."install-info\" must be placed ". + &perror("FATAL: \"\@exec install-info\" must be placed ". "after all the info files."); } elsif ($infoafterinstall) { - &perror("FATAL: move \"\@exec ".(($osname eq "NetBSD")?"%D/bin/":"")."install-info\" line to make ". + &perror("FATAL: move \"\@exec install-info\" line to make ". "sure that it is placed after all the info files. ". "(currently on line $infoinstallseen in $file)"); } if (!$inforemoveseen) { - &perror("FATAL: \"\@unexec ".(($osname eq "NetBSD")?"%D/bin/":"")."install-info --delete\" must ". + &perror("FATAL: \"\@unexec install-info --delete\" must ". "be placed before any of the info files listed."); } elsif ($infobeforeremove) { - &perror("FATAL: move \"\@exec ".(($osname eq "NetBSD")?"%D/bin/":"")."install-info --delete\" ". + &perror("FATAL: move \"\@exec install-info --delete\" ". "line to make sure ". "that it is placed before any of the info files. ". "(currently on line $inforemoveseen in $file)"); |