Bug 172976 - fix for bugged patch in devel/flyspray 0.9.9.7
Summary: fix for bugged patch in devel/flyspray 0.9.9.7
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-23 10:40 UTC by Nick Hilliard
Modified: 2012-10-29 08:30 UTC (History)
0 users

See Also:


Attachments
flyspray.diff (1.07 KB, patch)
2012-10-23 10:40 UTC, Nick Hilliard
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Nick Hilliard 2012-10-23 10:40:00 UTC
the patch in ports/172615 was misapplied due to crlf -> lf mangling.  Here's
a patch to rescue the port.
Comment 1 Raphael Kubo da Costa freebsd_committer freebsd_triage 2012-10-24 23:15:54 UTC
State Changed
From-To: open->closed

Just changing the line endings in the patch would not work. I have set 
the svn:eol-style property to CRLF in the patch file in r306358. This 
should solve the problem.
Comment 2 Mark Linimon 2012-10-28 05:05:34 UTC
----- Forwarded message from Nick Hilliard <nick@foobar.org> -----

Date: Sat, 27 Oct 2012 22:15:28 +0100
From: Nick Hilliard <nick@foobar.org>
To: rakuco@FreeBSD.org
Cc: freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/172976: fix for bugged patch in devel/flyspray 0.9.9.7

someone pointed out offline that probably a better fix for this problem
would be to use:

+USE_DOS2UNIX=	yes
+DOS2UNIX_REGEX=	.php

----- End forwarded message -----
Comment 3 Raphael Kubo da Costa freebsd_committer freebsd_triage 2012-10-29 08:27:56 UTC
Nick Hilliard <nick@foobar.org> writes:

> On 29/10/2012 00:04, Cpet Services wrote:
>> Using this:
>>
>> +	@${REINPLACE_CMD} "s|E_ALL|E_ALL \& ~E_STRICT|g" \
>> +		${WRKSRC}/includes/fix.inc.php
>>
>> As well as:
>>
>> +USE_DOS2UNIX=  yes
>>
>> +DOS2UNIX_REGEX=        .php
>>
>> You can remove the patch entirely
>
> I think this is a better approach than messing around with svn eol
> properties - thanks Chris.

This will end up patching all PHP source files; if you're fine with
this, please file a new PR with a patch (preferrably CC'ing me) and I
can commit it.