From owner-svn-ports-head@FreeBSD.ORG Sat Oct 26 14:49:00 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 9927F8A9; Sat, 26 Oct 2013 14:49:00 +0000 (UTC) (envelope-from marcus@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7679F216E; Sat, 26 Oct 2013 14:49:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QEn0iR003682; Sat, 26 Oct 2013 14:49:00 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QEn0TC003674; Sat, 26 Oct 2013 14:49:00 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201310261449.r9QEn0TC003674@svn.freebsd.org> From: Joe Marcus Clarke Date: Sat, 26 Oct 2013 14:49:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331698 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 14:49:00 -0000 Author: marcus Date: Sat Oct 26 14:48:59 2013 New Revision: 331698 URL: http://svnweb.freebsd.org/changeset/ports/331698 Log: Update to 2.14.7. * Fix a typo resulting in an undefined function [1] * Add X11 to the list of common OPTIONS [2] * Remove an errant space [2] * Do not warn on empty .svn directories. [2] PR: 183330 [1] Submitted by: Kubilay Kocak [1] Reported by: eadler [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 Oct 26 14:45:35 2013 (r331697) +++ head/ports-mgmt/portlint/Makefile Sat Oct 26 14:48:59 2013 (r331698) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.14.6 +PORTVERSION= 2.14.7 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sat Oct 26 14:45:35 2013 (r331697) +++ head/ports-mgmt/portlint/src/portlint.pl Sat Oct 26 14:48:59 2013 (r331698) @@ -17,7 +17,7 @@ # OpenBSD and NetBSD will be accepted. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.293 2013/10/20 00:49:57 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.297 2013/10/26 14:41:47 marcus Exp $ # use strict; @@ -52,7 +52,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 14; -my $micro = 6; +my $micro = 7; sub l { '[{(]'; } sub r { '[)}]'; } @@ -351,7 +351,7 @@ if ($committer) { "If it still needs to be there, put a dummy comment ". "to state that the file is intentionally left empty."); } elsif (-d && scalar(my @x = <$_/{*,.?*}>) <= 1) { - &perror("FATAL", $fullname, -1, "empty directory should be removed."); + &perror("FATAL", $fullname, -1, "empty directory should be removed.") unless ($fullname =~ /^\.svn/); } elsif (/^\./) { &perror("WARN", $fullname, -1, "dotfiles are not preferred. ". "If this file is a dotfile to be installed as an example, ". @@ -777,7 +777,7 @@ sub checkplist { if ($_ =~ m|\.mo$| && $makevar{USES} !~ /\bgettext\b/) { &perror("WARN", $file, $., "installing gettext translation files, ". - "please define USES[+]=gettext as appropriate"); + "please define USES[+]=gettext as appropriate"); } if ($_ =~ m|\.core$| && $_ !~ /^\@/) { @@ -1115,7 +1115,7 @@ sub check_depends_syntax { last; } if ($k =~ /^\$\{(\w+)\}$/) { - $k = get_makvar($1); + $k = get_makevar($1); } my @l = split(':', $k); @@ -1619,7 +1619,7 @@ sub checkmakefile { foreach my $i (@mopt) { 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'); + 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."); }