From owner-svn-ports-all@FreeBSD.ORG Sun Sep 21 16:59:00 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9E5D973; Sun, 21 Sep 2014 16:59:00 +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 8B18FE44; Sun, 21 Sep 2014 16:59:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8LGx0AG088903; Sun, 21 Sep 2014 16:59:00 GMT (envelope-from mva@FreeBSD.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8LGx0E9088898; Sun, 21 Sep 2014 16:59:00 GMT (envelope-from mva@FreeBSD.org) Message-Id: <201409211659.s8LGx0E9088898@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mva set sender to mva@FreeBSD.org using -f From: Marcus von Appen Date: Sun, 21 Sep 2014 16:59:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368776 - in head/devel/p5-PatchReader: . files 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-1 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: Sun, 21 Sep 2014 16:59:00 -0000 Author: mva Date: Sun Sep 21 16:58:59 2014 New Revision: 368776 URL: http://svnweb.freebsd.org/changeset/ports/368776 QAT: https://qat.redports.org/buildarchive/r368776/ Log: - Fix diff scan and output for new files within a non-CVS diff - Fix file name mangling for new files with whitespace - Convert line endings to unix This also should fix an issue in Bugzilla for patch attachments being truncated, if they contain new files. Some changes from https://rt.cpan.org/Public/Bug/Display.html?id=94181 and https://bugs.eclipse.org/bugs/show_bug.cgi?id=399391 were incorporated in this patch. PR: 193785, 190724 Approved by: toni.viemero@iki.fi (maintainer) Added: head/devel/p5-PatchReader/files/ head/devel/p5-PatchReader/files/patch-lib__PatchReader__Raw.pm (contents, props changed) Modified: head/devel/p5-PatchReader/Makefile Modified: head/devel/p5-PatchReader/Makefile ============================================================================== --- head/devel/p5-PatchReader/Makefile Sun Sep 21 15:47:08 2014 (r368775) +++ head/devel/p5-PatchReader/Makefile Sun Sep 21 16:58:59 2014 (r368776) @@ -3,6 +3,7 @@ PORTNAME= PatchReader PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:TMANNERM @@ -11,7 +12,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= toni.viemero@iki.fi COMMENT= Perl module with utilities to read and manipulate patches and CVS -USES= perl5 +USES= perl5 dos2unix USE_PERL5= configure .include Added: head/devel/p5-PatchReader/files/patch-lib__PatchReader__Raw.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p5-PatchReader/files/patch-lib__PatchReader__Raw.pm Sun Sep 21 16:58:59 2014 (r368776) @@ -0,0 +1,24 @@ +--- lib/PatchReader/Raw.pm.orig 2014-09-20 06:54:09 UTC ++++ lib/PatchReader/Raw.pm +@@ -41,7 +41,7 @@ + return if $line =~ /^\?/; + + # patch header parsing +- if ($line =~ /^---\s*([\S ]+)\s*\t([^\t\r\n]*)\s*(\S*)/) { ++ if ($line =~ /^---\s+([\S ]+)\s*?(?:\t([^\t\r\n]*)\s*(\S*))?/) { + $this->_maybe_end_file(); + + if ($1 eq "/dev/null") { +@@ -54,9 +54,12 @@ + + $this->{IN_HEADER} = 1; + +- } elsif ($line =~ /^\+\+\+\s*([\S ]+)\s*\t([^\t\r\n]*)(\S*)/) { ++ } elsif ($line =~ /^\+\+\+\s+([\S ]+)\s*?(?:\t([^\t\r\n]*)(\S*))?/) { + if ($1 eq "/dev/null") { + $this->{FILE_STATE}{is_remove} = 1; ++ } else { ++ $this->{FILE_STATE}{filename} = $1; + } + $this->{FILE_STATE}{new_date_str} = $2; + $this->{FILE_STATE}{new_revision} = $3 if $3;