diff options
author | schmonz <schmonz> | 2003-01-02 22:58:41 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2003-01-02 22:58:41 +0000 |
commit | 3d8edea76f067e5f6a680fcce235add225fd19e3 (patch) | |
tree | 84cd6218bba024404eb74e95065ecad2db33a13f /pkgtools/pkglint | |
parent | 5d1a703228fdfaa763877de9f32e0812a5bca84f (diff) | |
download | pkgsrc-3d8edea76f067e5f6a680fcce235add225fd19e3.tar.gz |
Update to 3.41:
- replace occurrences of "make" with @MAKE@
- add @MAKE@ to the list of variables to get sod (I never learned
properly how to conjugate "sed")
- warn about NO_PATCH, since it hinders more than it helps
- remove NO_PATCH from Makefile to quell new pkglint warning
Diffstat (limited to 'pkgtools/pkglint')
-rw-r--r-- | pkgtools/pkglint/Makefile | 7 | ||||
-rw-r--r-- | pkgtools/pkglint/files/lintpkgsrc.1 | 4 | ||||
-rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 8 | ||||
-rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 22 |
4 files changed, 23 insertions, 18 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 276db3c82aa..6adca67a3f4 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.145 2003/01/02 22:17:45 atatat Exp $ +# $NetBSD: Makefile,v 1.146 2003/01/02 22:58:41 schmonz Exp $ # -DISTNAME= pkglint-3.40 +DISTNAME= pkglint-3.41 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty @@ -17,7 +17,6 @@ USE_PERL5= YES EXTRACT_ONLY= # empty WRKSRC= ${WRKDIR} NO_CHECKSUM= yes -NO_PATCH= yes NO_CONFIGURE= yes MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR} @@ -39,12 +38,14 @@ do-build: ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ -e 's|@PORTSDIR@|${_PKGSRCDIR}|g' \ -e 's|@DISTVER@|${DISTVER}|g' \ + -e 's|@MAKE@|${MAKE}|g' \ < ${FILESDIR}/${FILE}.pl \ > ${WRKSRC}/${FILE} .endfor .for FILE in pkglint lintpkgsrc ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ -e 's|@PORTSDIR@|${_PKGSRCDIR}|g' \ + -e 's|@MAKE@|${MAKE}|g' \ < ${FILESDIR}/${FILE}.1 \ > ${WRKSRC}/${FILE}.1 ${NROFF} ${WRKSRC}/${FILE}.1 >${WRKSRC}/${FILE}.0 diff --git a/pkgtools/pkglint/files/lintpkgsrc.1 b/pkgtools/pkglint/files/lintpkgsrc.1 index 37ddb4ae3eb..1c8e146edfe 100644 --- a/pkgtools/pkglint/files/lintpkgsrc.1 +++ b/pkgtools/pkglint/files/lintpkgsrc.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: lintpkgsrc.1,v 1.21 2002/07/11 09:59:01 wiz Exp $ +.\" $NetBSD: lintpkgsrc.1,v 1.22 2003/01/02 22:58:41 schmonz Exp $ .\" .\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org) .\" Absolutely no warranty. @@ -131,7 +131,7 @@ flags respectively. As .Fl i plus for mismatched packages, display REQUIRED details and run -.Ql make fetch-list | sh +.Ql @MAKE@ fetch-list | sh to ensure all the distfiles needed for the latest version are present. .Pp diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 0c3c46007d0..67a5cf3f6ae 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl -# $NetBSD: lintpkgsrc.pl,v 1.73 2003/01/02 22:17:46 atatat Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.74 2003/01/02 22:58:42 schmonz Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -226,7 +226,7 @@ if ($opt{D} && @ARGV) } print "\n"; } - print "\nRunning 'make fetch-list | sh' for each package:\n"; + print "\nRunning '@MAKE@ fetch-list | sh' for each package:\n"; foreach my $pkgver (@update) { my($pkgdir); @@ -236,7 +236,7 @@ if ($opt{D} && @ARGV) { fail('Unable to determine '.$pkgver->pkg.' directory'); } print "$pkgsrcdir/$pkgdir\n"; safe_chdir("$pkgsrcdir/$pkgdir"); - system('make fetch-list | sh'); + system('@MAKE@ fetch-list | sh'); } } } @@ -716,7 +716,7 @@ sub parse_makefile_pkgsrc { # invoke make here as a last resort my($pkgsrcdir) = ($file =~ m:(/.*)/:); - my($makepkgname) = `cd $pkgsrcdir ; make show-vars VARNAMES=PKGNAME`; + my($makepkgname) = `cd $pkgsrcdir ; @MAKE@ show-vars VARNAMES=PKGNAME`; if ($makepkgname =~ /(.*)-(\d.*)/) { $pkgname = $makepkgname; } } diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index a66478875b4..ddda3cc1d0e 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.76 2002/12/23 14:05:45 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.77 2003/01/02 22:58:43 schmonz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -179,7 +179,7 @@ if (-e <$portdir/$distinfo>) { } } if ($patches && ! -f "$portdir/$distinfo" ) { - &perror("WARN: no $portdir/$distinfo file. Please run 'make makepatchsum'."); + &perror("WARN: no $portdir/$distinfo file. Please run '@MAKE@ makepatchsum'."); } } foreach $i (@checker) { @@ -201,14 +201,14 @@ if (-e <$portdir/$distinfo> ) { } } else { if ( ! $seen_NO_CHECKSUM ) { - &perror("WARN: no $portdir/$distinfo file. Please run 'make makesum'."); + &perror("WARN: no $portdir/$distinfo file. Please run '@MAKE@ makesum'."); } } if (-e <$portdir/$filesdir/md5> ) { - &perror("FATAL: $filesdir/md5 is deprecated -- run 'make mdi' to generate distinfo."); + &perror("FATAL: $filesdir/md5 is deprecated -- run '@MAKE@ mdi' to generate distinfo."); } if (-e <$portdir/$filesdir/patch-sum> ) { - &perror("FATAL: $filesdir/patch-sum is deprecated -- run 'make mps' to generate distinfo."); + &perror("FATAL: $filesdir/patch-sum is deprecated -- run '@MAKE@ mps' to generate distinfo."); } if (-e <$pkgdir/COMMENT> ) { &perror("FATAL: $pkgdir/COMMENT is deprecated -- please use a COMMENT variable instead."); @@ -314,11 +314,11 @@ sub checkdistinfo { chomp($calcsum); if ( "$sum" ne "$calcsum" ) { &perror("FATAL: checksum of $patch differs between $portdir/$file and\n" - ." $portdir/$patchdir/$patch. Rerun 'make makepatchsum'."); + ." $portdir/$patchdir/$patch. Rerun '@MAKE@ makepatchsum'."); } } elsif ($patch =~ /^patch-[a-z0-9]+$/) { &perror("FATAL: patchfile '$patch' is in $file\n" - ." but not in $portdir/$patchdir/$patch. Rerun 'make makepatchsum'."); + ." but not in $portdir/$patchdir/$patch. Rerun '@MAKE@ makepatchsum'."); } $indistinfofile{$patch} = 1; @@ -329,7 +329,7 @@ sub checkdistinfo { $patch =~ /\/([^\/]+)$/; if (! $indistinfofile{$1}) { &perror("FATAL: patchsum of '$1' is in $portdir/$patchdir/$1 but not in\n" - ." $file. Rerun 'make makepatchsum'."); + ." $file. Rerun '@MAKE@ makepatchsum'."); } } @@ -556,7 +556,7 @@ sub checkpatch { if ($file =~ /.*~$/) { &perror("WARN: is $file a backup file? If so, please remove it \n" - ." and rerun 'make makepatchsum'"); + ." and rerun '@MAKE@ makepatchsum'"); } open(IN, "< $portdir/$file") || return 0; @@ -783,6 +783,10 @@ sub checkmakefile { &perror("WARN: use of NO_PACKAGE to enforce license ". "restrictions is deprecated."); } + print "OK: checking NO_PATCH.\n" if ($verbose); + if ($whole =~ /\nNO_PATCH/) { + &perror("WARN: use of NO_PATCH deprecated."); + } print "OK: checking IGNORE.\n" if ($verbose); if ($whole =~ /\nIGNORE/) { &perror("FATAL: use of IGNORE deprecated, ". |