summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2013-05-06 02:53:24 +0000
committerobache <obache@pkgsrc.org>2013-05-06 02:53:24 +0000
commitab4a8fc6b03a418a0fff35b0b00a039c037329dc (patch)
treec4b33f49448eaf315863b8ff378961b20d40153c /pkgtools
parent160460647d5254c184115d5cf25304e62f7fc01e (diff)
downloadpkgsrc-ab4a8fc6b03a418a0fff35b0b00a039c037329dc.tar.gz
pkglint-4.129
* explain when desktop-file-utils is required. * error missing {hicolor,gnome}-icon-theme.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl28
2 files changed, 23 insertions, 9 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index a00f0eb5772..531b4c78d50 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.428 2013/03/26 15:11:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.429 2013/05/06 02:53:24 obache Exp $
# Note: if you update the version number, please have a look at the
# changes between the CVS tag "pkglint_current" and HEAD.
# After updating, please re-set the CVS tag to HEAD.
-DISTNAME= pkglint-4.128
+DISTNAME= pkglint-4.129
CATEGORIES= pkgtools
MASTER_SITES= # none
DISTFILES= # none
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index ccc6653a49e..da9a6eb4365 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.854 2013/03/26 15:11:20 schmonz Exp $
+# $NetBSD: pkglint.pl,v 1.855 2013/05/06 02:53:25 obache Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -6754,11 +6754,6 @@ sub checkfile_PLIST($) {
"Directories are removed automatically when they are empty.",
"When a package needs an empty directory, it can use the \@pkgdir",
"command in the PLIST");
-
- # XXX: this check should be made independent of dirrm
- if ($pkgpath ne "graphics/hicolor-icon-theme" && $arg =~ m"^share/icons/hicolor(?:$|/)") {
- $line->log_error("Please .include \"../../graphics/hicolor-icon-theme/buildlink3.mk\" and remove this line.");
- }
} elsif ($cmd eq "imake-man") {
my (@args) = split(/\s+/, $arg);
if (@args != 3) {
@@ -6910,9 +6905,28 @@ sub checkfile_PLIST($) {
} elsif ($text =~ m"^share/applications/.*\.desktop$") {
my $f = "../../sysutils/desktop-file-utils/desktopdb.mk";
if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
- $line->log_warning("Packages that install a .desktop entry should .include \"$f\".");
+ $line->log_warning("Packages that install a .desktop entry may .include \"$f\".");
+ $line->explain_warning(
+"If *.desktop files contain MimeType keys, global MIME Type registory DB",
+"must be updated by desktop-file-utils.",
+"Otherwise, this warning is harmless.");
+ }
+
+ } elsif ($pkgpath ne "graphics/hicolor-icon-theme" && $text =~ m"^share/icons/hicolor(?:$|/)") {
+ my $f = "../../graphics/hicolor-icon-theme/buildlink3.mk";
+ if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
+ $line->log_error("Please .include \"$f\"");
+ $line->explain_error(
+"If hicolor icon themes are installed, icon theme cache must be maintained.");
}
+ } elsif ($pkgpath ne "graphics/gnome-icon-theme" && $text =~ m"^share/icons/gnome(?:$|/)") {
+ my $f = "../../graphics/gnome-icon-theme/buildlink3.mk";
+ if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
+ $line->log_error("Please .include \"$f\"");
+ $line->explain_error(
+"If Gnome icon themes are installed, icon theme cache must be maintained.");
+ }
} elsif ($dirname eq "share/aclocal" && $basename =~ m"\.m4$") {
# Fine.