Date: Mon, 13 Apr 2015 04:53:26 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383894 - in head/ports-mgmt/portlint: . src Message-ID: <201504130453.t3D4rQmX037343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Mon Apr 13 04:53:25 2015 New Revision: 383894 URL: https://svnweb.freebsd.org/changeset/ports/383894 Log: Update to 2.16.3. * Check the patches to make sure they were generated using ``make patch'' [1] * Do not throw a bunch of Perl errors if the makefile is bad [2] PR: 197747 198887 Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Mon Apr 13 04:11:02 2015 (r383893) +++ head/ports-mgmt/portlint/Makefile Mon Apr 13 04:53:25 2015 (r383894) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.16.2 +PORTVERSION= 2.16.3 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Mon Apr 13 04:11:02 2015 (r383893) +++ head/ports-mgmt/portlint/src/portlint.pl Mon Apr 13 04:53:25 2015 (r383894) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.350 2015/02/04 17:07:25 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.354 2015/04/13 04:48:55 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 16; -my $micro = 2; +my $micro = 3; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -923,6 +923,13 @@ sub checkpatch { $whole = ''; while (<IN>) { $whole .= $_; + if (/^--- /) { + if ($_ !~ /UTC\s*$/) { + &perror("WARN", $file, -1, "patch was not generated using ". + "``make makepatch''. It is recommended to use ". + "``make makepatch'' to ensure proper patch format."); + } + } } if ($committer && $whole =~ /\wjavavm\w/) { @@ -3278,6 +3285,9 @@ sub get_makevar { chomp $result; $result =~ s/\n\n/\n\0\n/g; + if (${^CHILD_ERROR_NATIVE} != 0) { + die "\nFATAL ERROR: make(1) died with status ${^CHILD_ERROR_NATIVE} and returned '$result'"; + } return $result; } @@ -3290,6 +3300,9 @@ sub get_makevar_raw { chomp $result; $result =~ s/\n\n/\n\0\n/g; + if (${^CHILD_ERROR_NATIVE} != 0) { + die "\nFATAL ERROR: make(1) died with status ${^CHILD_ERROR_NATIVE} and returned '$result'"; + } return $result; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504130453.t3D4rQmX037343>