summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2001-11-03 21:34:35 +0000
committerhubertf <hubertf@pkgsrc.org>2001-11-03 21:34:35 +0000
commit4887a8d27bc57081362c10dc5d31a296fb313bd3 (patch)
tree5c2a4a0aa387bcbd1a5dcc1b75b2e99bce806522 /pkgtools
parentf880fbfd6d9332d0c7dfb4c972a0da9f12ff0de0 (diff)
downloadpkgsrc-4887a8d27bc57081362c10dc5d31a296fb313bd3.tar.gz
Bump to 3.11: warn about scripts/* and pkg/* dirs and contents
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl10
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index df66018f107..466e133dd69 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2001/11/01 23:26:42 jmc Exp $
+# $NetBSD: Makefile,v 1.114 2001/11/03 21:34:35 hubertf Exp $
#
-DISTNAME= pkglint-3.10
+DISTNAME= pkglint-3.11
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 791204aa615..576c3999694 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.59 2001/11/03 21:14:18 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.60 2001/11/03 21:34:36 hubertf Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -204,6 +204,14 @@ if (-e <$portdir/$filesdir/patch-sum> ) {
if (-e <$pkgdir/COMMENT> ) {
&perror("FATAL: $pkgdir/COMMENT is deprecated -- please use a COMMENT variable instead.");
}
+if (-d "$portdir/pkg" ) {
+ &perror("FATAL: $portdir/pkg and it's contents are deprecated!\n".
+ "\tPlease 'mv $portdir/pkg/* $portdir' and 'rmdir $portdir/pkg'.");
+}
+if (-d "$portdir/scripts" ) {
+ &perror("WARN: $portdir/scripts and it's contents are deprecated! Please call the script(s)\n".
+ "\texplicitly from the corresponding target(s) in the pkg's Makefile.");
+}
if (! -f "$portdir/$pkgdir/PLIST"
and ! -f "$portdir/$pkgdir/PLIST-mi"
and ! $seen_PLIST_SRC