couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alexander Shorin <kxe...@gmail.com>
Subject Re: 1.6.0 rc.5 -- updated FreeBSD 10.0 port - testers welcome
Date Tue, 20 May 2014 08:06:53 GMT
Hi Dave,

I just tried to apply your patch, but it seems failed for me:

/usr/ports # patch < /root/freebsd-ports-couchdb-1.6.0.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From f25f0e495a8b0bfbc443ea2e042784f36f577d02 Mon Sep 17 00:00:00 2001
|From: Dave Cottlehuber <dch@apache.org>
|Date: Thu, 15 May 2014 09:41:35 +0000
|Subject: [PATCH] couchdb: 1.6.0
|
|---
| databases/couchdb/Makefile  |  11 +-
| databases/couchdb/distinfo  |   4 +-
| databases/couchdb/pkg-plist | 311 +++++++++++++++++++++++---------------------
| 3 files changed, 163 insertions(+), 163 deletions(-)
|
|diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
|index 59423f8..ff9e882 100644
|--- a/databases/couchdb/Makefile
|+++ b/databases/couchdb/Makefile
--------------------------
Patching file Makefile using Plan A...
Hunk #1 failed at 2.
Hunk #2 succeeded at 44 with fuzz 1.
1 out of 2 hunks failed--saving rejects to Makefile.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo
|index 7addcaa..9bfcc97 100644
|--- a/databases/couchdb/distinfo
|+++ b/databases/couchdb/distinfo
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1 with fuzz 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/databases/couchdb/pkg-plist b/databases/couchdb/pkg-plist
|index b35996c..8a1842f 100644
|--- a/databases/couchdb/pkg-plist
|+++ b/databases/couchdb/pkg-plist
--------------------------
Patching file pkg-plist using Plan A...
Hunk #1 failed at 7.
Hunk #2 succeeded at 119 (offset -2 lines).
Hunk #3 failed at 310.
Hunk #4 failed at 439.
Hunk #5 failed at 460.
No such line 632 in input file, ignoring
Hunk #6 failed at 641.
5 out of 6 hunks failed--saving rejects to pkg-plist.rej
Hmm...  Ignoring the trailing garbage.
done

am I patching it wrong?

--
,,,^..^,,,


On Thu, May 15, 2014 at 4:10 PM, Dave Cottlehuber <dch@jsonified.com> wrote:
> Hey,
>
> If you have a FreeBSD 10 box around to test this updated port on, please let me know.
It’s my first attempt so a few eyes before submitting the PR would be great.
>
> - this patch[1] should apply cleanly to /usr/ports/databases/couchdb/ and give you a
nice updated CouchDB 1.6.0
> - You’ll need to ensure the current rc.5 tarball is in /usr/ports/distfiles/ as obviously
the rc.5 hasn’t been released and therefore isnt on normal ASF mirrors
>
> [1]: https://gist.githubusercontent.com/dch/494424e72fb07253f459/raw/freebsd-ports-couchdb-1.6.0.patch
>
> BTW I’ve not gotten the ubuntu launchpad system to build a 1.6.0 package for me yet,
anybody who knows how LP works could ping me on IRC later today, I’d <3 your wisdom.
>
> —
> Dave Cottlehuber
> dch@jsonified.com
> Sent from my Couch
>
>

Mime
View raw message