svn commit: r368776 - in head/devel/p5-PatchReader: . files

[Marcus von Appen]

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 at 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 at iki.fi
 COMMENT=	Perl module with utilities to read and manipulate patches and CVS
 
-USES=		perl5
+USES=		perl5 dos2unix
 USE_PERL5=	configure
 
 .include <bsd.port.mk>

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;