Import of pkgsrc-2015Q2

This commit is contained in:
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions

View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.460 2015/03/11 19:09:38 rillig Exp $
# $NetBSD: Makefile,v 1.463 2015/06/14 18:18:34 wiz Exp $
PKGNAME= pkglint-4.153
PKGNAME= pkglint-4.155
CATEGORIES= pkgtools
OWNER= wiz@NetBSD.org

View File

@@ -1,4 +1,4 @@
# $NetBSD: makevars.map,v 1.262 2015/03/11 19:05:58 rillig Exp $
# $NetBSD: makevars.map,v 1.264 2015/05/03 15:20:24 bsiegert Exp $
#
# This file contains the guessed type of some variables, according to
@@ -151,6 +151,7 @@ BINGRP UserGroupName [$system]
BINMODE FileMode [$system]
BINOWN UserGroupName [$system]
BOOTSTRAP_DEPENDS InternalList of DependencyWithPath [c:a,m:a,o:a,*.mk:a]
BOOTSTRAP_PKG YesNo [$package]
BROKEN Message []
BROKEN_GETTEXT_DETECTION YesNo [$package]
BROKEN_EXCEPT_ON_PLATFORM List of PlatformTriple [$package_list]
@@ -657,7 +658,7 @@ PTHREAD_OPTS List of { native optional require } [m:as,c:a,b:a]
PTHREAD_TYPE Identifier [$system]
# ^^ or "native" or "none".
PY_PATCHPLIST Yes [$package]
PYPKGPREFIX { py26 py27 py33 } [*:pu, pyversion.mk:s, *:]
PYPKGPREFIX { py27 py33 py34 } [*:pu, pyversion.mk:s, *:]
PYTHON_FOR_BUILD_ONLY Yes [$package]
REPLACE_PYTHON List of Pathmask [$package_list]
PYTHON_VERSIONS_ACCEPTED List of Version [$package]
@@ -739,6 +740,7 @@ USE_BUILTIN.* YesNo_Indirectly [builtin.mk:s]
USE_CMAKE Yes [$package]
USE_CROSSBASE Yes [m:s]
USE_FEATURES List of Identifier [$package]
USE_GCC_RUNTIME YesNo [$package]
USE_GNU_CONFIGURE_HOST YesNo [$package]
USE_GNU_ICONV Yes [m:s,c:s,o:s]
USE_IMAKE Yes [m:s]

View File

@@ -1,5 +1,5 @@
#! @PERL@
# $NetBSD: pkglint.pl,v 1.877 2015/03/11 19:05:58 rillig Exp $
# $NetBSD: pkglint.pl,v 1.878 2015/06/14 18:18:34 wiz Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -2116,7 +2116,7 @@ sub parse_mk_cond($$) {
sub parse_licenses($) {
my ($licenses) = @_;
$licenses =~ s,\${PERL5_LICENSE},gnu-gpl-v2 OR artistic,g;
$licenses =~ s,\$\{PERL5_LICENSE},gnu-gpl-v2 OR artistic,g;
$licenses =~ s,[()]|AND|OR,,g; # XXX: treats OR like AND
my @licenses = split(/\s+/, $licenses);
return \@licenses;
@@ -3578,7 +3578,7 @@ sub checkline_mk_shelltext($$) {
"\${PREFIX}.");
}
if (($state == SCST_INSTALL_DIR || $state == SCST_INSTALL_DIR2) && $shellword !~ regex_mk_shellvaruse && $shellword =~ m"^(?:\${DESTDIR\})?\$\{PREFIX(?:|:Q)\}/(.*)") {
if (($state == SCST_INSTALL_DIR || $state == SCST_INSTALL_DIR2) && $shellword !~ regex_mk_shellvaruse && $shellword =~ m"^(?:\$\{DESTDIR\})?\$\{PREFIX(?:|:Q)\}/(.*)") {
my ($dirname) = ($1);
$line->log_note("You can use AUTO_MKDIRS=yes or INSTALLATION_DIRS+= ${dirname} instead of this command.");
@@ -7011,7 +7011,7 @@ sub checkfile_PLIST($) {
$opt_debug_unchecked and $line->log_debug("Unchecked pathname \"${text}\".");
}
if ($text =~ /\${PKGLOCALEDIR}/ && defined($pkgctx_vardef) && !exists($pkgctx_vardef->{"USE_PKGLOCALEDIR"})) {
if ($text =~ /\$\{PKGLOCALEDIR}/ && defined($pkgctx_vardef) && !exists($pkgctx_vardef->{"USE_PKGLOCALEDIR"})) {
$line->log_warning("PLIST contains \${PKGLOCALEDIR}, but USE_PKGLOCALEDIR was not found.");
}