From owner-svn-ports-all@FreeBSD.ORG Sat Jun 21 19:24:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B81EE267; Sat, 21 Jun 2014 19:24:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A53222C5D; Sat, 21 Jun 2014 19:24:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LJOpRx051878; Sat, 21 Jun 2014 19:24:51 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5LJOpKx051876; Sat, 21 Jun 2014 19:24:51 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201406211924.s5LJOpKx051876@svn.freebsd.org> From: Joe Marcus Clarke Date: Sat, 21 Jun 2014 19:24:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358739 - in head/ports-mgmt/portlint: . src X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 19:24:51 -0000 Author: marcus Date: Sat Jun 21 19:24:50 2014 New Revision: 358739 URL: http://svnweb.freebsd.org/changeset/ports/358739 QAT: https://qat.redports.org/buildarchive/r358739/ Log: Update to 2.15.2. * Add s3.amazonaws.com to the list of whitelist master sites. [1] * Correct a typo. [2] * Add support for the @sample directive. [3] * Check for USE_AUTOTOOLS=libtool and suggest USES=libtool instead. PR: 183864 [3] Submitted by: skreuzer [1] culot [2] Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Sat Jun 21 19:02:41 2014 (r358738) +++ head/ports-mgmt/portlint/Makefile Sat Jun 21 19:24:50 2014 (r358739) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.15.1 +PORTVERSION= 2.15.2 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sat Jun 21 19:02:41 2014 (r358738) +++ head/ports-mgmt/portlint/src/portlint.pl Sat Jun 21 19:24:50 2014 (r358739) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.314 2014/04/19 18:36:43 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.319 2014/06/21 19:21:54 marcus Exp $ # use strict; @@ -45,12 +45,12 @@ $contblank = 1; $portdir = '.'; @ALLOWED_FULL_PATHS = qw(/boot/loader.conf /compat/ /dev/null /etc/inetd.conf); -@MASTERSITES_WHITELIST = qw(googlecode.com nodeload.github.com); +@MASTERSITES_WHITELIST = qw(googlecode.com nodeload.github.com s3.amazonaws.com); # version variables my $major = 2; my $minor = 15; -my $micro = 1; +my $micro = 2; sub l { '[{(]'; } sub r { '[)}]'; } @@ -700,6 +700,13 @@ sub checkplist { } elsif ($_ eq "\@cwd") { ; # @cwd by itself means change directory back to the original # PREFIX. + } elsif ($_ =~ /^\@sample\s+(\S*)/) { + my $sl = $.; + if ($1 !~ /\.sample$/) { + &perror("WARN", $file, $sl, "\@sample directive references". + " file that does not end in ``.sample''. Sample". + " files must end in ``.sample''."); + } } else { &perror("WARN", $file, $., "unknown pkg-plist directive \"$_\""); @@ -1578,8 +1585,8 @@ sub checkmakefile { if (!grep(/^$i$/, @opt, @aopt)) { # skip global options next if ($i eq 'DOCS' or $i eq 'NLS' or $i eq 'EXAMPLES' or $i eq 'IPV6' or $i eq 'X11'); - &perror("WARN", $file, -1, "$i is appears in PORT_OPTIONS:M, ". - "but not listed in OPTIONS_DEFINE."); + &perror("WARN", $file, -1, "$i appears in PORT_OPTIONS:M, ". + "but is not listed in OPTIONS_DEFINE."); } } @@ -1857,8 +1864,8 @@ ruby sed sdl-config sh sort sysctl touch $cmdnames{'strip'} = '${STRIP_CMD}'; $cmdnames{'unzip'} = '${UNZIP_CMD}'; $cmdnames{'pkg_create'} = '${PKG_CMD}'; - foreach my $i (qw(aclocal autoconf autoheader automake autoreconf autoupdate autoscan ifnames libtool libtoolize)) { - $autocmdnames{$i} = "\$\{" . ( ( $i !~ /auto|aclocal|libtool/ ) ? "AUTO" : "" ) . "\U$i\E\}"; + foreach my $i (qw(aclocal autoconf autoheader automake autoreconf autoupdate autoscan ifnames libtoolize)) { + $autocmdnames{$i} = "\$\{" . ( ( $i !~ /auto|aclocal/ ) ? "AUTO" : "" ) . "\U$i\E\}"; } # # ignore parameter string to echo command. @@ -1930,6 +1937,11 @@ ruby sed sdl-config sh sort sysctl touch } } + if ($makevar{'USE_AUTOTOOLS'} =~ /\blibtool\b/) { + &perror("WARN", $file, -1, "USE_AUTOTOOLS=libtool is deprecated. ". + "Use USES=libtool instead."); + } + # # whole file: check for use of paths that have macro replacements #