Patch updates calibre port to current version without USB support Fix: Apply patch and update How-To-Repeat: Apply patch and update
Responsible Changed From-To: freebsd-ports-bugs->stas Over to maintainer (via the GNATS Auto Assign Tool)
I second on this pr, but this pr requires http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/148830 to be applied first. And with one more patch for Makefile to add misc/chmlib as a dependency. -- plasma
Update to current version calibre-0.7.14 -- plasma
Update to calibre-0.7.17 -- plasma
On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com> wrote: > Update to calibre-0.7.17 I'm not able to get this patch to apply cleanly. I've also tried -p4 with the same result. How do you apply this diff or is it reversed? [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < ~/calibre-0.7.17.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -u calibre.orig/Makefile calibre/Makefile |--- calibre.orig/Makefile 2010-07-25 03:49:54.000000000 +0800 |+++ calibre/Makefile 2010-09-06 10:36:32.000000000 +0800 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 6. Hunk #2 succeeded at 18. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -u calibre.orig/distinfo calibre/distinfo |--- calibre.orig/distinfo 2009-12-15 10:40:17.000000000 +0800 |+++ calibre/distinfo 2010-09-06 10:36:18.000000000 +0800 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Common subdirectories: calibre.orig/files and calibre/files |diff -u calibre.orig/pkg-plist calibre/pkg-plist |--- calibre.orig/pkg-plist 2009-12-15 10:40:17.000000000 +0800 |+++ calibre/pkg-plist 2010-09-06 11:27:20.000000000 +0800 -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 64. Hunk #3 succeeded at 84. Hunk #4 succeeded at 106. Hunk #5 succeeded at 135. Hunk #6 succeeded at 153. Hunk #7 succeeded at 204. Hunk #8 succeeded at 224. Hunk #9 succeeded at 249. Hunk #10 succeeded at 284. Hunk #11 succeeded at 322. Hunk #12 succeeded at 337. Hunk #13 succeeded at 387. Hunk #14 succeeded at 472. Hunk #15 succeeded at 526. Hunk #16 succeeded at 559. Hunk #17 succeeded at 582. Hunk #18 succeeded at 598. Hunk #19 succeeded at 633. Hunk #20 succeeded at 651. Hunk #21 succeeded at 672. Hunk #22 succeeded at 690. Hunk #23 succeeded at 741. Hunk #24 succeeded at 781. Hunk #25 succeeded at 807. Hunk #26 succeeded at 833. Hunk #27 succeeded at 869. Hunk #28 succeeded at 890. Hunk #29 succeeded at 905. Hunk #30 succeeded at 948. Hunk #31 succeeded at 1053. Hunk #32 succeeded at 1130. Hunk #33 succeeded at 1177. Hunk #34 succeeded at 1199. Hunk #35 succeeded at 1217. Hunk #36 succeeded at 1289. Hunk #37 succeeded at 1318. Hunk #38 succeeded at 1622. Hunk #39 succeeded at 1807. Hunk #40 succeeded at 1913. Hunk #41 succeeded at 1942. Hunk #42 succeeded at 1958. Hunk #43 succeeded at 2046. Hunk #44 succeeded at 2070. Hunk #45 succeeded at 2090. Hunk #46 succeeded at 2128. Hunk #47 succeeded at 2146. Hmm... Ignoring the trailing garbage. done [tethys]:/usr/ports/deskutils/calibre-new> sudo make ===> Vulnerability check disabled, database not found ===> License check disabled, port has not defined LICENSE ===> Found saved configuration for calibre-0.6.27 ===> Extracting for calibre-0.7.17 => MD5 Checksum OK for calibre-0.7.17.tar.gz. => SHA256 Checksum OK for calibre-0.7.17.tar.gz. ===> Patching for calibre-0.7.17 ===> Applying FreeBSD patches for calibre-0.7.17 Ignoring previously applied (or reversed) patch. 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej => Patch patch-setup___init__.py failed to apply cleanly. *** Error code 1 Stop in /usr/ports/deskutils/calibre-new. *** Error code 1 Stop in /usr/ports/deskutils/calibre-new. Exit 1 [tethys]:/usr/ports/deskutils/calibre-new>
Hi Rusty, The files directory should be empty. I'm not sure why the patch file doesn't say those files should be deleted. Anyway, please remove all files/patch-*, and the port should make. plasma On Sat, Sep 11, 2010 at 9:38 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> wrot= e: > On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com> > wrote: >> Update to calibre-0.7.17 > > I'm not able to get this patch to apply cleanly. =A0I've also tried -p4 > with the same result. =A0How do you apply this diff or is it reversed? > > [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < > ~/calibre-0.7.17.diff > Hmm... =A0Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -u calibre.orig/Makefile calibre/Makefile > |--- calibre.orig/Makefile =A0 =A0 =A02010-07-25 03:49:54.000000000 +0800 > |+++ calibre/Makefile =A0 2010-09-06 10:36:32.000000000 +0800 > -------------------------- > Patching file Makefile using Plan A... > Hunk #1 succeeded at 6. > Hunk #2 succeeded at 18. > Hmm... =A0The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -u calibre.orig/distinfo calibre/distinfo > |--- calibre.orig/distinfo =A0 =A0 =A02009-12-15 10:40:17.000000000 +0800 > |+++ calibre/distinfo =A0 2010-09-06 10:36:18.000000000 +0800 > -------------------------- > Patching file distinfo using Plan A... > Hunk #1 succeeded at 1. > Hmm... =A0The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Common subdirectories: calibre.orig/files and calibre/files > |diff -u calibre.orig/pkg-plist calibre/pkg-plist > |--- calibre.orig/pkg-plist =A0 =A0 2009-12-15 10:40:17.000000000 +0800 > |+++ calibre/pkg-plist =A02010-09-06 11:27:20.000000000 +0800 > -------------------------- > Patching file pkg-plist using Plan A... > Hunk #1 succeeded at 31. > Hunk #2 succeeded at 64. > Hunk #3 succeeded at 84. > Hunk #4 succeeded at 106. > Hunk #5 succeeded at 135. > Hunk #6 succeeded at 153. > Hunk #7 succeeded at 204. > Hunk #8 succeeded at 224. > Hunk #9 succeeded at 249. > Hunk #10 succeeded at 284. > Hunk #11 succeeded at 322. > Hunk #12 succeeded at 337. > Hunk #13 succeeded at 387. > Hunk #14 succeeded at 472. > Hunk #15 succeeded at 526. > Hunk #16 succeeded at 559. > Hunk #17 succeeded at 582. > Hunk #18 succeeded at 598. > Hunk #19 succeeded at 633. > Hunk #20 succeeded at 651. > Hunk #21 succeeded at 672. > Hunk #22 succeeded at 690. > Hunk #23 succeeded at 741. > Hunk #24 succeeded at 781. > Hunk #25 succeeded at 807. > Hunk #26 succeeded at 833. > Hunk #27 succeeded at 869. > Hunk #28 succeeded at 890. > Hunk #29 succeeded at 905. > Hunk #30 succeeded at 948. > Hunk #31 succeeded at 1053. > Hunk #32 succeeded at 1130. > Hunk #33 succeeded at 1177. > Hunk #34 succeeded at 1199. > Hunk #35 succeeded at 1217. > Hunk #36 succeeded at 1289. > Hunk #37 succeeded at 1318. > Hunk #38 succeeded at 1622. > Hunk #39 succeeded at 1807. > Hunk #40 succeeded at 1913. > Hunk #41 succeeded at 1942. > Hunk #42 succeeded at 1958. > Hunk #43 succeeded at 2046. > Hunk #44 succeeded at 2070. > Hunk #45 succeeded at 2090. > Hunk #46 succeeded at 2128. > Hunk #47 succeeded at 2146. > Hmm... =A0Ignoring the trailing garbage. > done > [tethys]:/usr/ports/deskutils/calibre-new> sudo make > =3D=3D=3D> =A0Vulnerability check disabled, database not found > =3D=3D=3D> =A0License check disabled, port has not defined LICENSE > =3D=3D=3D> =A0Found saved configuration for calibre-0.6.27 > =3D=3D=3D> =A0Extracting for calibre-0.7.17 > =3D> MD5 Checksum OK for calibre-0.7.17.tar.gz. > =3D> SHA256 Checksum OK for calibre-0.7.17.tar.gz. > =3D=3D=3D> =A0Patching for calibre-0.7.17 > =3D=3D=3D> =A0Applying FreeBSD patches for calibre-0.7.17 > Ignoring previously applied (or reversed) patch. > 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej > =3D> Patch patch-setup___init__.py failed to apply cleanly. > *** Error code 1 > > Stop in /usr/ports/deskutils/calibre-new. > *** Error code 1 > > Stop in /usr/ports/deskutils/calibre-new. > Exit 1 > [tethys]:/usr/ports/deskutils/calibre-new> > --=20 plasma
Plasma, I'm just not getting the clean apply... [tethys]:/usr/ports/deskutils> sudo cp -R calibre/ calibre-new [tethys]:/usr/ports/deskutils> cd !$ cd calibre-new [tethys]:/usr/ports/deskutils/calibre-new> sudo make clean ===> Cleaning for calibre-0.6.27_6 [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < ~/calibre-0.7.17.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -u calibre.orig/Makefile calibre/Makefile |--- calibre.orig/Makefile 2010-07-25 03:49:54.000000000 +0800 |+++ calibre/Makefile 2010-09-06 10:36:32.000000000 +0800 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 6. Hunk #2 succeeded at 18. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -u calibre.orig/distinfo calibre/distinfo |--- calibre.orig/distinfo 2009-12-15 10:40:17.000000000 +0800 |+++ calibre/distinfo 2010-09-06 10:36:18.000000000 +0800 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Common subdirectories: calibre.orig/files and calibre/files |diff -u calibre.orig/pkg-plist calibre/pkg-plist |--- calibre.orig/pkg-plist 2009-12-15 10:40:17.000000000 +0800 |+++ calibre/pkg-plist 2010-09-06 11:27:20.000000000 +0800 -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 64. Hunk #3 succeeded at 84. Hunk #4 succeeded at 106. Hunk #5 succeeded at 135. Hunk #6 succeeded at 153. Hunk #7 succeeded at 204. Hunk #8 succeeded at 224. Hunk #9 succeeded at 249. Hunk #10 succeeded at 284. Hunk #11 succeeded at 322. Hunk #12 succeeded at 337. Hunk #13 succeeded at 387. Hunk #14 succeeded at 472. Hunk #15 succeeded at 526. Hunk #16 succeeded at 559. Hunk #17 succeeded at 582. Hunk #18 succeeded at 598. Hunk #19 succeeded at 633. Hunk #20 succeeded at 651. Hunk #21 succeeded at 672. Hunk #22 succeeded at 690. Hunk #23 succeeded at 741. Hunk #24 succeeded at 781. Hunk #25 succeeded at 807. Hunk #26 succeeded at 833. Hunk #27 succeeded at 869. Hunk #28 succeeded at 890. Hunk #29 succeeded at 905. Hunk #30 succeeded at 948. Hunk #31 succeeded at 1053. Hunk #32 succeeded at 1130. Hunk #33 succeeded at 1177. Hunk #34 succeeded at 1199. Hunk #35 succeeded at 1217. Hunk #36 succeeded at 1289. Hunk #37 succeeded at 1318. Hunk #38 succeeded at 1622. Hunk #39 succeeded at 1807. Hunk #40 succeeded at 1913. Hunk #41 succeeded at 1942. Hunk #42 succeeded at 1958. Hunk #43 succeeded at 2046. Hunk #44 succeeded at 2070. Hunk #45 succeeded at 2090. Hunk #46 succeeded at 2128. Hunk #47 succeeded at 2146. Hmm... Ignoring the trailing garbage. done [tethys]:/usr/ports/deskutils/calibre-new> sudo make ===> Vulnerability check disabled, database not found ===> License check disabled, port has not defined LICENSE ===> Found saved configuration for calibre-0.6.27 ===> Extracting for calibre-0.7.17 => MD5 Checksum OK for calibre-0.7.17.tar.gz. => SHA256 Checksum OK for calibre-0.7.17.tar.gz. ===> Patching for calibre-0.7.17 ===> Applying FreeBSD patches for calibre-0.7.17 Ignoring previously applied (or reversed) patch. 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej => Patch patch-setup___init__.py failed to apply cleanly. *** Error code 1 Stop in /usr/ports/deskutils/calibre-new. *** Error code 1 Stop in /usr/ports/deskutils/calibre-new. Exit 1 [tethys]:/usr/ports/deskutils/calibre-new> On Tue, 14 Sep 2010 10:19:52 +0800, plasmaball <plasmaball@gmail.com> wrote: > Hi Rusty, > > The files directory should be empty. I'm not sure why the patch file > doesn't say those files should be deleted. Anyway, please remove all > files/patch-*, and the port should make. > > > plasma > > On Sat, Sep 11, 2010 at 9:38 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> wrote: >> On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com> >> wrote: >>> Update to calibre-0.7.17 >> >> I'm not able to get this patch to apply cleanly.  I've also tried -p4 >> with the same result.  How do you apply this diff or is it reversed? >> >> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >> ~/calibre-0.7.17.diff >> Hmm...  Looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |diff -u calibre.orig/Makefile calibre/Makefile >> |--- calibre.orig/Makefile    2010-07-25 03:49:54.000000000 +0800 >> |+++ calibre/Makefile  2010-09-06 10:36:32.000000000 +0800 >> -------------------------- >> Patching file Makefile using Plan A... >> Hunk #1 succeeded at 6. >> Hunk #2 succeeded at 18. >> Hmm...  The next patch looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |diff -u calibre.orig/distinfo calibre/distinfo >> |--- calibre.orig/distinfo    2009-12-15 10:40:17.000000000 +0800 >> |+++ calibre/distinfo  2010-09-06 10:36:18.000000000 +0800 >> -------------------------- >> Patching file distinfo using Plan A... >> Hunk #1 succeeded at 1. >> Hmm...  The next patch looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |Common subdirectories: calibre.orig/files and calibre/files >> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >> |--- calibre.orig/pkg-plist   2009-12-15 10:40:17.000000000 +0800 >> |+++ calibre/pkg-plist  2010-09-06 11:27:20.000000000 +0800 >> -------------------------- >> Patching file pkg-plist using Plan A... >> Hunk #1 succeeded at 31. >> Hunk #2 succeeded at 64. >> Hunk #3 succeeded at 84. >> Hunk #4 succeeded at 106. >> Hunk #5 succeeded at 135. >> Hunk #6 succeeded at 153. >> Hunk #7 succeeded at 204. >> Hunk #8 succeeded at 224. >> Hunk #9 succeeded at 249. >> Hunk #10 succeeded at 284. >> Hunk #11 succeeded at 322. >> Hunk #12 succeeded at 337. >> Hunk #13 succeeded at 387. >> Hunk #14 succeeded at 472. >> Hunk #15 succeeded at 526. >> Hunk #16 succeeded at 559. >> Hunk #17 succeeded at 582. >> Hunk #18 succeeded at 598. >> Hunk #19 succeeded at 633. >> Hunk #20 succeeded at 651. >> Hunk #21 succeeded at 672. >> Hunk #22 succeeded at 690. >> Hunk #23 succeeded at 741. >> Hunk #24 succeeded at 781. >> Hunk #25 succeeded at 807. >> Hunk #26 succeeded at 833. >> Hunk #27 succeeded at 869. >> Hunk #28 succeeded at 890. >> Hunk #29 succeeded at 905. >> Hunk #30 succeeded at 948. >> Hunk #31 succeeded at 1053. >> Hunk #32 succeeded at 1130. >> Hunk #33 succeeded at 1177. >> Hunk #34 succeeded at 1199. >> Hunk #35 succeeded at 1217. >> Hunk #36 succeeded at 1289. >> Hunk #37 succeeded at 1318. >> Hunk #38 succeeded at 1622. >> Hunk #39 succeeded at 1807. >> Hunk #40 succeeded at 1913. >> Hunk #41 succeeded at 1942. >> Hunk #42 succeeded at 1958. >> Hunk #43 succeeded at 2046. >> Hunk #44 succeeded at 2070. >> Hunk #45 succeeded at 2090. >> Hunk #46 succeeded at 2128. >> Hunk #47 succeeded at 2146. >> Hmm...  Ignoring the trailing garbage. >> done >> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >> ===>  Vulnerability check disabled, database not found >> ===>  License check disabled, port has not defined LICENSE >> ===>  Found saved configuration for calibre-0.6.27 >> ===>  Extracting for calibre-0.7.17 >> => MD5 Checksum OK for calibre-0.7.17.tar.gz. >> => SHA256 Checksum OK for calibre-0.7.17.tar.gz. >> ===>  Patching for calibre-0.7.17 >> ===>  Applying FreeBSD patches for calibre-0.7.17 >> Ignoring previously applied (or reversed) patch. >> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >> => Patch patch-setup___init__.py failed to apply cleanly. >> *** Error code 1 >> >> Stop in /usr/ports/deskutils/calibre-new. >> *** Error code 1 >> >> Stop in /usr/ports/deskutils/calibre-new. >> Exit 1 >> [tethys]:/usr/ports/deskutils/calibre-new> >>
Hi Rusty, I mean, you should remove all patch-* files under deskutils/calibre-new/files/ after the patch is applied. I also did it manually when I use your patch before. :) plasma On Tue, Sep 14, 2010 at 10:29 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> wro= te: > Plasma, > > I'm just not getting the clean apply... > > [tethys]:/usr/ports/deskutils> sudo cp -R calibre/ calibre-new > [tethys]:/usr/ports/deskutils> cd !$ > cd calibre-new > [tethys]:/usr/ports/deskutils/calibre-new> sudo make clean > =3D=3D=3D> =A0Cleaning for calibre-0.6.27_6 > [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < > ~/calibre-0.7.17.diff > Hmm... =A0Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -u calibre.orig/Makefile calibre/Makefile > |--- calibre.orig/Makefile =A0 =A0 =A02010-07-25 03:49:54.000000000 +0800 > |+++ calibre/Makefile =A0 2010-09-06 10:36:32.000000000 +0800 > -------------------------- > Patching file Makefile using Plan A... > Hunk #1 succeeded at 6. > Hunk #2 succeeded at 18. > Hmm... =A0The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -u calibre.orig/distinfo calibre/distinfo > |--- calibre.orig/distinfo =A0 =A0 =A02009-12-15 10:40:17.000000000 +0800 > |+++ calibre/distinfo =A0 2010-09-06 10:36:18.000000000 +0800 > -------------------------- > Patching file distinfo using Plan A... > Hunk #1 succeeded at 1. > Hmm... =A0The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Common subdirectories: calibre.orig/files and calibre/files > |diff -u calibre.orig/pkg-plist calibre/pkg-plist > |--- calibre.orig/pkg-plist =A0 =A0 2009-12-15 10:40:17.000000000 +0800 > |+++ calibre/pkg-plist =A02010-09-06 11:27:20.000000000 +0800 > -------------------------- > Patching file pkg-plist using Plan A... > Hunk #1 succeeded at 31. > Hunk #2 succeeded at 64. > Hunk #3 succeeded at 84. > Hunk #4 succeeded at 106. > Hunk #5 succeeded at 135. > Hunk #6 succeeded at 153. > Hunk #7 succeeded at 204. > Hunk #8 succeeded at 224. > Hunk #9 succeeded at 249. > Hunk #10 succeeded at 284. > Hunk #11 succeeded at 322. > Hunk #12 succeeded at 337. > Hunk #13 succeeded at 387. > Hunk #14 succeeded at 472. > Hunk #15 succeeded at 526. > Hunk #16 succeeded at 559. > Hunk #17 succeeded at 582. > Hunk #18 succeeded at 598. > Hunk #19 succeeded at 633. > Hunk #20 succeeded at 651. > Hunk #21 succeeded at 672. > Hunk #22 succeeded at 690. > Hunk #23 succeeded at 741. > Hunk #24 succeeded at 781. > Hunk #25 succeeded at 807. > Hunk #26 succeeded at 833. > Hunk #27 succeeded at 869. > Hunk #28 succeeded at 890. > Hunk #29 succeeded at 905. > Hunk #30 succeeded at 948. > Hunk #31 succeeded at 1053. > Hunk #32 succeeded at 1130. > Hunk #33 succeeded at 1177. > Hunk #34 succeeded at 1199. > Hunk #35 succeeded at 1217. > Hunk #36 succeeded at 1289. > Hunk #37 succeeded at 1318. > Hunk #38 succeeded at 1622. > Hunk #39 succeeded at 1807. > Hunk #40 succeeded at 1913. > Hunk #41 succeeded at 1942. > Hunk #42 succeeded at 1958. > Hunk #43 succeeded at 2046. > Hunk #44 succeeded at 2070. > Hunk #45 succeeded at 2090. > Hunk #46 succeeded at 2128. > Hunk #47 succeeded at 2146. > Hmm... =A0Ignoring the trailing garbage. > done > [tethys]:/usr/ports/deskutils/calibre-new> sudo make > =3D=3D=3D> =A0Vulnerability check disabled, database not found > =3D=3D=3D> =A0License check disabled, port has not defined LICENSE > =3D=3D=3D> =A0Found saved configuration for calibre-0.6.27 > =3D=3D=3D> =A0Extracting for calibre-0.7.17 > =3D> MD5 Checksum OK for calibre-0.7.17.tar.gz. > =3D> SHA256 Checksum OK for calibre-0.7.17.tar.gz. > =3D=3D=3D> =A0Patching for calibre-0.7.17 > =3D=3D=3D> =A0Applying FreeBSD patches for calibre-0.7.17 > Ignoring previously applied (or reversed) patch. > 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej > =3D> Patch patch-setup___init__.py failed to apply cleanly. > *** Error code 1 > > Stop in /usr/ports/deskutils/calibre-new. > *** Error code 1 > > Stop in /usr/ports/deskutils/calibre-new. > Exit 1 > [tethys]:/usr/ports/deskutils/calibre-new> > > On Tue, 14 Sep 2010 10:19:52 +0800, plasmaball <plasmaball@gmail.com> > wrote: >> Hi Rusty, >> >> The files directory should be empty. =A0I'm not sure why the patch file >> doesn't say those files should be deleted. =A0Anyway, please remove all >> files/patch-*, and the port should make. >> >> >> plasma >> >> On Sat, Sep 11, 2010 at 9:38 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> w= rote: >>> On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com> >>> wrote: >>>> Update to calibre-0.7.17 >>> >>> I'm not able to get this patch to apply cleanly. =A0I've also tried -p4 >>> with the same result. =A0How do you apply this diff or is it reversed? >>> >>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>> ~/calibre-0.7.17.diff >>> Hmm... =A0Looks like a unified diff to me... >>> The text leading up to this was: >>> -------------------------- >>> |diff -u calibre.orig/Makefile calibre/Makefile >>> |--- calibre.orig/Makefile =A0 =A0 =A02010-07-25 03:49:54.000000000 +08= 00 >>> |+++ calibre/Makefile =A0 2010-09-06 10:36:32.000000000 +0800 >>> -------------------------- >>> Patching file Makefile using Plan A... >>> Hunk #1 succeeded at 6. >>> Hunk #2 succeeded at 18. >>> Hmm... =A0The next patch looks like a unified diff to me... >>> The text leading up to this was: >>> -------------------------- >>> |diff -u calibre.orig/distinfo calibre/distinfo >>> |--- calibre.orig/distinfo =A0 =A0 =A02009-12-15 10:40:17.000000000 +08= 00 >>> |+++ calibre/distinfo =A0 2010-09-06 10:36:18.000000000 +0800 >>> -------------------------- >>> Patching file distinfo using Plan A... >>> Hunk #1 succeeded at 1. >>> Hmm... =A0The next patch looks like a unified diff to me... >>> The text leading up to this was: >>> -------------------------- >>> |Common subdirectories: calibre.orig/files and calibre/files >>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>> |--- calibre.orig/pkg-plist =A0 =A0 2009-12-15 10:40:17.000000000 +0800 >>> |+++ calibre/pkg-plist =A02010-09-06 11:27:20.000000000 +0800 >>> -------------------------- >>> Patching file pkg-plist using Plan A... >>> Hunk #1 succeeded at 31. >>> Hunk #2 succeeded at 64. >>> Hunk #3 succeeded at 84. >>> Hunk #4 succeeded at 106. >>> Hunk #5 succeeded at 135. >>> Hunk #6 succeeded at 153. >>> Hunk #7 succeeded at 204. >>> Hunk #8 succeeded at 224. >>> Hunk #9 succeeded at 249. >>> Hunk #10 succeeded at 284. >>> Hunk #11 succeeded at 322. >>> Hunk #12 succeeded at 337. >>> Hunk #13 succeeded at 387. >>> Hunk #14 succeeded at 472. >>> Hunk #15 succeeded at 526. >>> Hunk #16 succeeded at 559. >>> Hunk #17 succeeded at 582. >>> Hunk #18 succeeded at 598. >>> Hunk #19 succeeded at 633. >>> Hunk #20 succeeded at 651. >>> Hunk #21 succeeded at 672. >>> Hunk #22 succeeded at 690. >>> Hunk #23 succeeded at 741. >>> Hunk #24 succeeded at 781. >>> Hunk #25 succeeded at 807. >>> Hunk #26 succeeded at 833. >>> Hunk #27 succeeded at 869. >>> Hunk #28 succeeded at 890. >>> Hunk #29 succeeded at 905. >>> Hunk #30 succeeded at 948. >>> Hunk #31 succeeded at 1053. >>> Hunk #32 succeeded at 1130. >>> Hunk #33 succeeded at 1177. >>> Hunk #34 succeeded at 1199. >>> Hunk #35 succeeded at 1217. >>> Hunk #36 succeeded at 1289. >>> Hunk #37 succeeded at 1318. >>> Hunk #38 succeeded at 1622. >>> Hunk #39 succeeded at 1807. >>> Hunk #40 succeeded at 1913. >>> Hunk #41 succeeded at 1942. >>> Hunk #42 succeeded at 1958. >>> Hunk #43 succeeded at 2046. >>> Hunk #44 succeeded at 2070. >>> Hunk #45 succeeded at 2090. >>> Hunk #46 succeeded at 2128. >>> Hunk #47 succeeded at 2146. >>> Hmm... =A0Ignoring the trailing garbage. >>> done >>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>> =3D=3D=3D> =A0Vulnerability check disabled, database not found >>> =3D=3D=3D> =A0License check disabled, port has not defined LICENSE >>> =3D=3D=3D> =A0Found saved configuration for calibre-0.6.27 >>> =3D=3D=3D> =A0Extracting for calibre-0.7.17 >>> =3D> MD5 Checksum OK for calibre-0.7.17.tar.gz. >>> =3D> SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>> =3D=3D=3D> =A0Patching for calibre-0.7.17 >>> =3D=3D=3D> =A0Applying FreeBSD patches for calibre-0.7.17 >>> Ignoring previously applied (or reversed) patch. >>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>> =3D> Patch patch-setup___init__.py failed to apply cleanly. >>> *** Error code 1 >>> >>> Stop in /usr/ports/deskutils/calibre-new. >>> *** Error code 1 >>> >>> Stop in /usr/ports/deskutils/calibre-new. >>> Exit 1 >>> [tethys]:/usr/ports/deskutils/calibre-new> >>> > > --=20 plasma
That means both you and I screwed up our patches unfortunately. Let me test as you suggest and see how that works but ideally a patch should go on what is there currently. Rusty On Tue, 14 Sep 2010 10:34:43 +0800, plasmaball <plasmaball@gmail.com> wrote: > Hi Rusty, > > I mean, you should remove all patch-* files under > deskutils/calibre-new/files/ after the patch is applied. I also did > it manually when I use your patch before. :) > > > plasma > > On Tue, Sep 14, 2010 at 10:29 AM, Rusty Nejdl > <rnejdl@ringofsaturn.com> wrote: >> Plasma, >> >> I'm just not getting the clean apply... >> >> [tethys]:/usr/ports/deskutils> sudo cp -R calibre/ calibre-new >> [tethys]:/usr/ports/deskutils> cd !$ >> cd calibre-new >> [tethys]:/usr/ports/deskutils/calibre-new> sudo make clean >> ===>  Cleaning for calibre-0.6.27_6 >> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >> ~/calibre-0.7.17.diff >> Hmm...  Looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |diff -u calibre.orig/Makefile calibre/Makefile >> |--- calibre.orig/Makefile    2010-07-25 03:49:54.000000000 +0800 >> |+++ calibre/Makefile  2010-09-06 10:36:32.000000000 +0800 >> -------------------------- >> Patching file Makefile using Plan A... >> Hunk #1 succeeded at 6. >> Hunk #2 succeeded at 18. >> Hmm...  The next patch looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |diff -u calibre.orig/distinfo calibre/distinfo >> |--- calibre.orig/distinfo    2009-12-15 10:40:17.000000000 +0800 >> |+++ calibre/distinfo  2010-09-06 10:36:18.000000000 +0800 >> -------------------------- >> Patching file distinfo using Plan A... >> Hunk #1 succeeded at 1. >> Hmm...  The next patch looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |Common subdirectories: calibre.orig/files and calibre/files >> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >> |--- calibre.orig/pkg-plist   2009-12-15 10:40:17.000000000 +0800 >> |+++ calibre/pkg-plist  2010-09-06 11:27:20.000000000 +0800 >> -------------------------- >> Patching file pkg-plist using Plan A... >> Hunk #1 succeeded at 31. >> Hunk #2 succeeded at 64. >> Hunk #3 succeeded at 84. >> Hunk #4 succeeded at 106. >> Hunk #5 succeeded at 135. >> Hunk #6 succeeded at 153. >> Hunk #7 succeeded at 204. >> Hunk #8 succeeded at 224. >> Hunk #9 succeeded at 249. >> Hunk #10 succeeded at 284. >> Hunk #11 succeeded at 322. >> Hunk #12 succeeded at 337. >> Hunk #13 succeeded at 387. >> Hunk #14 succeeded at 472. >> Hunk #15 succeeded at 526. >> Hunk #16 succeeded at 559. >> Hunk #17 succeeded at 582. >> Hunk #18 succeeded at 598. >> Hunk #19 succeeded at 633. >> Hunk #20 succeeded at 651. >> Hunk #21 succeeded at 672. >> Hunk #22 succeeded at 690. >> Hunk #23 succeeded at 741. >> Hunk #24 succeeded at 781. >> Hunk #25 succeeded at 807. >> Hunk #26 succeeded at 833. >> Hunk #27 succeeded at 869. >> Hunk #28 succeeded at 890. >> Hunk #29 succeeded at 905. >> Hunk #30 succeeded at 948. >> Hunk #31 succeeded at 1053. >> Hunk #32 succeeded at 1130. >> Hunk #33 succeeded at 1177. >> Hunk #34 succeeded at 1199. >> Hunk #35 succeeded at 1217. >> Hunk #36 succeeded at 1289. >> Hunk #37 succeeded at 1318. >> Hunk #38 succeeded at 1622. >> Hunk #39 succeeded at 1807. >> Hunk #40 succeeded at 1913. >> Hunk #41 succeeded at 1942. >> Hunk #42 succeeded at 1958. >> Hunk #43 succeeded at 2046. >> Hunk #44 succeeded at 2070. >> Hunk #45 succeeded at 2090. >> Hunk #46 succeeded at 2128. >> Hunk #47 succeeded at 2146. >> Hmm...  Ignoring the trailing garbage. >> done >> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >> ===>  Vulnerability check disabled, database not found >> ===>  License check disabled, port has not defined LICENSE >> ===>  Found saved configuration for calibre-0.6.27 >> ===>  Extracting for calibre-0.7.17 >> => MD5 Checksum OK for calibre-0.7.17.tar.gz. >> => SHA256 Checksum OK for calibre-0.7.17.tar.gz. >> ===>  Patching for calibre-0.7.17 >> ===>  Applying FreeBSD patches for calibre-0.7.17 >> Ignoring previously applied (or reversed) patch. >> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >> => Patch patch-setup___init__.py failed to apply cleanly. >> *** Error code 1 >> >> Stop in /usr/ports/deskutils/calibre-new. >> *** Error code 1 >> >> Stop in /usr/ports/deskutils/calibre-new. >> Exit 1 >> [tethys]:/usr/ports/deskutils/calibre-new> >> >> On Tue, 14 Sep 2010 10:19:52 +0800, plasmaball <plasmaball@gmail.com> >> wrote: >>> Hi Rusty, >>> >>> The files directory should be empty.  I'm not sure why the patch file >>> doesn't say those files should be deleted.  Anyway, please remove all >>> files/patch-*, and the port should make. >>> >>> >>> plasma >>> >>> On Sat, Sep 11, 2010 at 9:38 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> wrote: >>>> On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com> >>>> wrote: >>>>> Update to calibre-0.7.17 >>>> >>>> I'm not able to get this patch to apply cleanly.  I've also tried -p4 >>>> with the same result.  How do you apply this diff or is it reversed? >>>> >>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>>> ~/calibre-0.7.17.diff >>>> Hmm...  Looks like a unified diff to me... >>>> The text leading up to this was: >>>> -------------------------- >>>> |diff -u calibre.orig/Makefile calibre/Makefile >>>> |--- calibre.orig/Makefile    2010-07-25 03:49:54.000000000 +0800 >>>> |+++ calibre/Makefile  2010-09-06 10:36:32.000000000 +0800 >>>> -------------------------- >>>> Patching file Makefile using Plan A... >>>> Hunk #1 succeeded at 6. >>>> Hunk #2 succeeded at 18. >>>> Hmm...  The next patch looks like a unified diff to me... >>>> The text leading up to this was: >>>> -------------------------- >>>> |diff -u calibre.orig/distinfo calibre/distinfo >>>> |--- calibre.orig/distinfo    2009-12-15 10:40:17.000000000 +0800 >>>> |+++ calibre/distinfo  2010-09-06 10:36:18.000000000 +0800 >>>> -------------------------- >>>> Patching file distinfo using Plan A... >>>> Hunk #1 succeeded at 1. >>>> Hmm...  The next patch looks like a unified diff to me... >>>> The text leading up to this was: >>>> -------------------------- >>>> |Common subdirectories: calibre.orig/files and calibre/files >>>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>>> |--- calibre.orig/pkg-plist   2009-12-15 10:40:17.000000000 +0800 >>>> |+++ calibre/pkg-plist  2010-09-06 11:27:20.000000000 +0800 >>>> -------------------------- >>>> Patching file pkg-plist using Plan A... >>>> Hunk #1 succeeded at 31. >>>> Hunk #2 succeeded at 64. >>>> Hunk #3 succeeded at 84. >>>> Hunk #4 succeeded at 106. >>>> Hunk #5 succeeded at 135. >>>> Hunk #6 succeeded at 153. >>>> Hunk #7 succeeded at 204. >>>> Hunk #8 succeeded at 224. >>>> Hunk #9 succeeded at 249. >>>> Hunk #10 succeeded at 284. >>>> Hunk #11 succeeded at 322. >>>> Hunk #12 succeeded at 337. >>>> Hunk #13 succeeded at 387. >>>> Hunk #14 succeeded at 472. >>>> Hunk #15 succeeded at 526. >>>> Hunk #16 succeeded at 559. >>>> Hunk #17 succeeded at 582. >>>> Hunk #18 succeeded at 598. >>>> Hunk #19 succeeded at 633. >>>> Hunk #20 succeeded at 651. >>>> Hunk #21 succeeded at 672. >>>> Hunk #22 succeeded at 690. >>>> Hunk #23 succeeded at 741. >>>> Hunk #24 succeeded at 781. >>>> Hunk #25 succeeded at 807. >>>> Hunk #26 succeeded at 833. >>>> Hunk #27 succeeded at 869. >>>> Hunk #28 succeeded at 890. >>>> Hunk #29 succeeded at 905. >>>> Hunk #30 succeeded at 948. >>>> Hunk #31 succeeded at 1053. >>>> Hunk #32 succeeded at 1130. >>>> Hunk #33 succeeded at 1177. >>>> Hunk #34 succeeded at 1199. >>>> Hunk #35 succeeded at 1217. >>>> Hunk #36 succeeded at 1289. >>>> Hunk #37 succeeded at 1318. >>>> Hunk #38 succeeded at 1622. >>>> Hunk #39 succeeded at 1807. >>>> Hunk #40 succeeded at 1913. >>>> Hunk #41 succeeded at 1942. >>>> Hunk #42 succeeded at 1958. >>>> Hunk #43 succeeded at 2046. >>>> Hunk #44 succeeded at 2070. >>>> Hunk #45 succeeded at 2090. >>>> Hunk #46 succeeded at 2128. >>>> Hunk #47 succeeded at 2146. >>>> Hmm...  Ignoring the trailing garbage. >>>> done >>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>>> ===>  Vulnerability check disabled, database not found >>>> ===>  License check disabled, port has not defined LICENSE >>>> ===>  Found saved configuration for calibre-0.6.27 >>>> ===>  Extracting for calibre-0.7.17 >>>> => MD5 Checksum OK for calibre-0.7.17.tar.gz. >>>> => SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>>> ===>  Patching for calibre-0.7.17 >>>> ===>  Applying FreeBSD patches for calibre-0.7.17 >>>> Ignoring previously applied (or reversed) patch. >>>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>>> => Patch patch-setup___init__.py failed to apply cleanly. >>>> *** Error code 1 >>>> >>>> Stop in /usr/ports/deskutils/calibre-new. >>>> *** Error code 1 >>>> >>>> Stop in /usr/ports/deskutils/calibre-new. >>>> Exit 1 >>>> [tethys]:/usr/ports/deskutils/calibre-new> >>>> >> >>
I'm not good at making patches. Maybe you can teach me how to create one? = :) plasma On Tue, Sep 14, 2010 at 10:36 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> wro= te: > That means both you and I screwed up our patches unfortunately. =A0Let me > test as you suggest and see how that works but ideally a patch should go > on what is there currently. > > Rusty > > On Tue, 14 Sep 2010 10:34:43 +0800, plasmaball <plasmaball@gmail.com> > wrote: >> Hi Rusty, >> >> I mean, you should remove all patch-* files under >> deskutils/calibre-new/files/ after the patch is applied. =A0I also did >> it manually when I use your patch before. :) >> >> >> plasma >> >> On Tue, Sep 14, 2010 at 10:29 AM, Rusty Nejdl >> <rnejdl@ringofsaturn.com> wrote: >>> Plasma, >>> >>> I'm just not getting the clean apply... >>> >>> [tethys]:/usr/ports/deskutils> sudo cp -R calibre/ calibre-new >>> [tethys]:/usr/ports/deskutils> cd !$ >>> cd calibre-new >>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make clean >>> =3D=3D=3D> =A0Cleaning for calibre-0.6.27_6 >>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>> ~/calibre-0.7.17.diff >>> Hmm... =A0Looks like a unified diff to me... >>> The text leading up to this was: >>> -------------------------- >>> |diff -u calibre.orig/Makefile calibre/Makefile >>> |--- calibre.orig/Makefile =A0 =A0 =A02010-07-25 03:49:54.000000000 +08= 00 >>> |+++ calibre/Makefile =A0 2010-09-06 10:36:32.000000000 +0800 >>> -------------------------- >>> Patching file Makefile using Plan A... >>> Hunk #1 succeeded at 6. >>> Hunk #2 succeeded at 18. >>> Hmm... =A0The next patch looks like a unified diff to me... >>> The text leading up to this was: >>> -------------------------- >>> |diff -u calibre.orig/distinfo calibre/distinfo >>> |--- calibre.orig/distinfo =A0 =A0 =A02009-12-15 10:40:17.000000000 +08= 00 >>> |+++ calibre/distinfo =A0 2010-09-06 10:36:18.000000000 +0800 >>> -------------------------- >>> Patching file distinfo using Plan A... >>> Hunk #1 succeeded at 1. >>> Hmm... =A0The next patch looks like a unified diff to me... >>> The text leading up to this was: >>> -------------------------- >>> |Common subdirectories: calibre.orig/files and calibre/files >>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>> |--- calibre.orig/pkg-plist =A0 =A0 2009-12-15 10:40:17.000000000 +0800 >>> |+++ calibre/pkg-plist =A02010-09-06 11:27:20.000000000 +0800 >>> -------------------------- >>> Patching file pkg-plist using Plan A... >>> Hunk #1 succeeded at 31. >>> Hunk #2 succeeded at 64. >>> Hunk #3 succeeded at 84. >>> Hunk #4 succeeded at 106. >>> Hunk #5 succeeded at 135. >>> Hunk #6 succeeded at 153. >>> Hunk #7 succeeded at 204. >>> Hunk #8 succeeded at 224. >>> Hunk #9 succeeded at 249. >>> Hunk #10 succeeded at 284. >>> Hunk #11 succeeded at 322. >>> Hunk #12 succeeded at 337. >>> Hunk #13 succeeded at 387. >>> Hunk #14 succeeded at 472. >>> Hunk #15 succeeded at 526. >>> Hunk #16 succeeded at 559. >>> Hunk #17 succeeded at 582. >>> Hunk #18 succeeded at 598. >>> Hunk #19 succeeded at 633. >>> Hunk #20 succeeded at 651. >>> Hunk #21 succeeded at 672. >>> Hunk #22 succeeded at 690. >>> Hunk #23 succeeded at 741. >>> Hunk #24 succeeded at 781. >>> Hunk #25 succeeded at 807. >>> Hunk #26 succeeded at 833. >>> Hunk #27 succeeded at 869. >>> Hunk #28 succeeded at 890. >>> Hunk #29 succeeded at 905. >>> Hunk #30 succeeded at 948. >>> Hunk #31 succeeded at 1053. >>> Hunk #32 succeeded at 1130. >>> Hunk #33 succeeded at 1177. >>> Hunk #34 succeeded at 1199. >>> Hunk #35 succeeded at 1217. >>> Hunk #36 succeeded at 1289. >>> Hunk #37 succeeded at 1318. >>> Hunk #38 succeeded at 1622. >>> Hunk #39 succeeded at 1807. >>> Hunk #40 succeeded at 1913. >>> Hunk #41 succeeded at 1942. >>> Hunk #42 succeeded at 1958. >>> Hunk #43 succeeded at 2046. >>> Hunk #44 succeeded at 2070. >>> Hunk #45 succeeded at 2090. >>> Hunk #46 succeeded at 2128. >>> Hunk #47 succeeded at 2146. >>> Hmm... =A0Ignoring the trailing garbage. >>> done >>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>> =3D=3D=3D> =A0Vulnerability check disabled, database not found >>> =3D=3D=3D> =A0License check disabled, port has not defined LICENSE >>> =3D=3D=3D> =A0Found saved configuration for calibre-0.6.27 >>> =3D=3D=3D> =A0Extracting for calibre-0.7.17 >>> =3D> MD5 Checksum OK for calibre-0.7.17.tar.gz. >>> =3D> SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>> =3D=3D=3D> =A0Patching for calibre-0.7.17 >>> =3D=3D=3D> =A0Applying FreeBSD patches for calibre-0.7.17 >>> Ignoring previously applied (or reversed) patch. >>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>> =3D> Patch patch-setup___init__.py failed to apply cleanly. >>> *** Error code 1 >>> >>> Stop in /usr/ports/deskutils/calibre-new. >>> *** Error code 1 >>> >>> Stop in /usr/ports/deskutils/calibre-new. >>> Exit 1 >>> [tethys]:/usr/ports/deskutils/calibre-new> >>> >>> On Tue, 14 Sep 2010 10:19:52 +0800, plasmaball <plasmaball@gmail.com> >>> wrote: >>>> Hi Rusty, >>>> >>>> The files directory should be empty. =A0I'm not sure why the patch fil= e >>>> doesn't say those files should be deleted. =A0Anyway, please remove al= l >>>> files/patch-*, and the port should make. >>>> >>>> >>>> plasma >>>> >>>> On Sat, Sep 11, 2010 at 9:38 AM, Rusty Nejdl <rnejdl@ringofsaturn.com>= wrote: >>>>> On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com> >>>>> wrote: >>>>>> Update to calibre-0.7.17 >>>>> >>>>> I'm not able to get this patch to apply cleanly. =A0I've also tried -= p4 >>>>> with the same result. =A0How do you apply this diff or is it reversed= ? >>>>> >>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>>>> ~/calibre-0.7.17.diff >>>>> Hmm... =A0Looks like a unified diff to me... >>>>> The text leading up to this was: >>>>> -------------------------- >>>>> |diff -u calibre.orig/Makefile calibre/Makefile >>>>> |--- calibre.orig/Makefile =A0 =A0 =A02010-07-25 03:49:54.000000000 += 0800 >>>>> |+++ calibre/Makefile =A0 2010-09-06 10:36:32.000000000 +0800 >>>>> -------------------------- >>>>> Patching file Makefile using Plan A... >>>>> Hunk #1 succeeded at 6. >>>>> Hunk #2 succeeded at 18. >>>>> Hmm... =A0The next patch looks like a unified diff to me... >>>>> The text leading up to this was: >>>>> -------------------------- >>>>> |diff -u calibre.orig/distinfo calibre/distinfo >>>>> |--- calibre.orig/distinfo =A0 =A0 =A02009-12-15 10:40:17.000000000 += 0800 >>>>> |+++ calibre/distinfo =A0 2010-09-06 10:36:18.000000000 +0800 >>>>> -------------------------- >>>>> Patching file distinfo using Plan A... >>>>> Hunk #1 succeeded at 1. >>>>> Hmm... =A0The next patch looks like a unified diff to me... >>>>> The text leading up to this was: >>>>> -------------------------- >>>>> |Common subdirectories: calibre.orig/files and calibre/files >>>>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>>>> |--- calibre.orig/pkg-plist =A0 =A0 2009-12-15 10:40:17.000000000 +08= 00 >>>>> |+++ calibre/pkg-plist =A02010-09-06 11:27:20.000000000 +0800 >>>>> -------------------------- >>>>> Patching file pkg-plist using Plan A... >>>>> Hunk #1 succeeded at 31. >>>>> Hunk #2 succeeded at 64. >>>>> Hunk #3 succeeded at 84. >>>>> Hunk #4 succeeded at 106. >>>>> Hunk #5 succeeded at 135. >>>>> Hunk #6 succeeded at 153. >>>>> Hunk #7 succeeded at 204. >>>>> Hunk #8 succeeded at 224. >>>>> Hunk #9 succeeded at 249. >>>>> Hunk #10 succeeded at 284. >>>>> Hunk #11 succeeded at 322. >>>>> Hunk #12 succeeded at 337. >>>>> Hunk #13 succeeded at 387. >>>>> Hunk #14 succeeded at 472. >>>>> Hunk #15 succeeded at 526. >>>>> Hunk #16 succeeded at 559. >>>>> Hunk #17 succeeded at 582. >>>>> Hunk #18 succeeded at 598. >>>>> Hunk #19 succeeded at 633. >>>>> Hunk #20 succeeded at 651. >>>>> Hunk #21 succeeded at 672. >>>>> Hunk #22 succeeded at 690. >>>>> Hunk #23 succeeded at 741. >>>>> Hunk #24 succeeded at 781. >>>>> Hunk #25 succeeded at 807. >>>>> Hunk #26 succeeded at 833. >>>>> Hunk #27 succeeded at 869. >>>>> Hunk #28 succeeded at 890. >>>>> Hunk #29 succeeded at 905. >>>>> Hunk #30 succeeded at 948. >>>>> Hunk #31 succeeded at 1053. >>>>> Hunk #32 succeeded at 1130. >>>>> Hunk #33 succeeded at 1177. >>>>> Hunk #34 succeeded at 1199. >>>>> Hunk #35 succeeded at 1217. >>>>> Hunk #36 succeeded at 1289. >>>>> Hunk #37 succeeded at 1318. >>>>> Hunk #38 succeeded at 1622. >>>>> Hunk #39 succeeded at 1807. >>>>> Hunk #40 succeeded at 1913. >>>>> Hunk #41 succeeded at 1942. >>>>> Hunk #42 succeeded at 1958. >>>>> Hunk #43 succeeded at 2046. >>>>> Hunk #44 succeeded at 2070. >>>>> Hunk #45 succeeded at 2090. >>>>> Hunk #46 succeeded at 2128. >>>>> Hunk #47 succeeded at 2146. >>>>> Hmm... =A0Ignoring the trailing garbage. >>>>> done >>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>>>> =3D=3D=3D> =A0Vulnerability check disabled, database not found >>>>> =3D=3D=3D> =A0License check disabled, port has not defined LICENSE >>>>> =3D=3D=3D> =A0Found saved configuration for calibre-0.6.27 >>>>> =3D=3D=3D> =A0Extracting for calibre-0.7.17 >>>>> =3D> MD5 Checksum OK for calibre-0.7.17.tar.gz. >>>>> =3D> SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>>>> =3D=3D=3D> =A0Patching for calibre-0.7.17 >>>>> =3D=3D=3D> =A0Applying FreeBSD patches for calibre-0.7.17 >>>>> Ignoring previously applied (or reversed) patch. >>>>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>>>> =3D> Patch patch-setup___init__.py failed to apply cleanly. >>>>> *** Error code 1 >>>>> >>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>> *** Error code 1 >>>>> >>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>> Exit 1 >>>>> [tethys]:/usr/ports/deskutils/calibre-new> >>>>> >>> >>> > > --=20 plasma
Plasma, I can't say I am very good either but... - I make a port-new folder, such as calibre-new. - Make calibre-new port compile, install and deinstall as cleanly as can be. - diff -ruN calibre calibre-new > ~/calibre.patch I have a bit more info here: http://networking.ringofsatun.com/Unix/createportpatch.php And then I should be able to apply that patch with a patch -p1. Rusty On Tue, 14 Sep 2010 10:50:32 +0800, plasmaball <plasmaball@gmail.com> wrote: > I'm not good at making patches. Maybe you can teach me how to create one? :) > > > plasma > > On Tue, Sep 14, 2010 at 10:36 AM, Rusty Nejdl > <rnejdl@ringofsaturn.com> wrote: >> That means both you and I screwed up our patches unfortunately.  Let me >> test as you suggest and see how that works but ideally a patch should go >> on what is there currently. >> >> Rusty >> >> On Tue, 14 Sep 2010 10:34:43 +0800, plasmaball <plasmaball@gmail.com> >> wrote: >>> Hi Rusty, >>> >>> I mean, you should remove all patch-* files under >>> deskutils/calibre-new/files/ after the patch is applied.  I also did >>> it manually when I use your patch before. :) >>> >>> >>> plasma >>> >>> On Tue, Sep 14, 2010 at 10:29 AM, Rusty Nejdl >>> <rnejdl@ringofsaturn.com> wrote: >>>> Plasma, >>>> >>>> I'm just not getting the clean apply... >>>> >>>> [tethys]:/usr/ports/deskutils> sudo cp -R calibre/ calibre-new >>>> [tethys]:/usr/ports/deskutils> cd !$ >>>> cd calibre-new >>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make clean >>>> ===>  Cleaning for calibre-0.6.27_6 >>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>>> ~/calibre-0.7.17.diff >>>> Hmm...  Looks like a unified diff to me... >>>> The text leading up to this was: >>>> -------------------------- >>>> |diff -u calibre.orig/Makefile calibre/Makefile >>>> |--- calibre.orig/Makefile    2010-07-25 03:49:54.000000000 +0800 >>>> |+++ calibre/Makefile  2010-09-06 10:36:32.000000000 +0800 >>>> -------------------------- >>>> Patching file Makefile using Plan A... >>>> Hunk #1 succeeded at 6. >>>> Hunk #2 succeeded at 18. >>>> Hmm...  The next patch looks like a unified diff to me... >>>> The text leading up to this was: >>>> -------------------------- >>>> |diff -u calibre.orig/distinfo calibre/distinfo >>>> |--- calibre.orig/distinfo    2009-12-15 10:40:17.000000000 +0800 >>>> |+++ calibre/distinfo  2010-09-06 10:36:18.000000000 +0800 >>>> -------------------------- >>>> Patching file distinfo using Plan A... >>>> Hunk #1 succeeded at 1. >>>> Hmm...  The next patch looks like a unified diff to me... >>>> The text leading up to this was: >>>> -------------------------- >>>> |Common subdirectories: calibre.orig/files and calibre/files >>>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>>> |--- calibre.orig/pkg-plist   2009-12-15 10:40:17.000000000 +0800 >>>> |+++ calibre/pkg-plist  2010-09-06 11:27:20.000000000 +0800 >>>> -------------------------- >>>> Patching file pkg-plist using Plan A... >>>> Hunk #1 succeeded at 31. >>>> Hunk #2 succeeded at 64. >>>> Hunk #3 succeeded at 84. >>>> Hunk #4 succeeded at 106. >>>> Hunk #5 succeeded at 135. >>>> Hunk #6 succeeded at 153. >>>> Hunk #7 succeeded at 204. >>>> Hunk #8 succeeded at 224. >>>> Hunk #9 succeeded at 249. >>>> Hunk #10 succeeded at 284. >>>> Hunk #11 succeeded at 322. >>>> Hunk #12 succeeded at 337. >>>> Hunk #13 succeeded at 387. >>>> Hunk #14 succeeded at 472. >>>> Hunk #15 succeeded at 526. >>>> Hunk #16 succeeded at 559. >>>> Hunk #17 succeeded at 582. >>>> Hunk #18 succeeded at 598. >>>> Hunk #19 succeeded at 633. >>>> Hunk #20 succeeded at 651. >>>> Hunk #21 succeeded at 672. >>>> Hunk #22 succeeded at 690. >>>> Hunk #23 succeeded at 741. >>>> Hunk #24 succeeded at 781. >>>> Hunk #25 succeeded at 807. >>>> Hunk #26 succeeded at 833. >>>> Hunk #27 succeeded at 869. >>>> Hunk #28 succeeded at 890. >>>> Hunk #29 succeeded at 905. >>>> Hunk #30 succeeded at 948. >>>> Hunk #31 succeeded at 1053. >>>> Hunk #32 succeeded at 1130. >>>> Hunk #33 succeeded at 1177. >>>> Hunk #34 succeeded at 1199. >>>> Hunk #35 succeeded at 1217. >>>> Hunk #36 succeeded at 1289. >>>> Hunk #37 succeeded at 1318. >>>> Hunk #38 succeeded at 1622. >>>> Hunk #39 succeeded at 1807. >>>> Hunk #40 succeeded at 1913. >>>> Hunk #41 succeeded at 1942. >>>> Hunk #42 succeeded at 1958. >>>> Hunk #43 succeeded at 2046. >>>> Hunk #44 succeeded at 2070. >>>> Hunk #45 succeeded at 2090. >>>> Hunk #46 succeeded at 2128. >>>> Hunk #47 succeeded at 2146. >>>> Hmm...  Ignoring the trailing garbage. >>>> done >>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>>> ===>  Vulnerability check disabled, database not found >>>> ===>  License check disabled, port has not defined LICENSE >>>> ===>  Found saved configuration for calibre-0.6.27 >>>> ===>  Extracting for calibre-0.7.17 >>>> => MD5 Checksum OK for calibre-0.7.17.tar.gz. >>>> => SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>>> ===>  Patching for calibre-0.7.17 >>>> ===>  Applying FreeBSD patches for calibre-0.7.17 >>>> Ignoring previously applied (or reversed) patch. >>>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>>> => Patch patch-setup___init__.py failed to apply cleanly. >>>> *** Error code 1 >>>> >>>> Stop in /usr/ports/deskutils/calibre-new. >>>> *** Error code 1 >>>> >>>> Stop in /usr/ports/deskutils/calibre-new. >>>> Exit 1 >>>> [tethys]:/usr/ports/deskutils/calibre-new> >>>> >>>> On Tue, 14 Sep 2010 10:19:52 +0800, plasmaball <plasmaball@gmail.com> >>>> wrote: >>>>> Hi Rusty, >>>>> >>>>> The files directory should be empty.  I'm not sure why the patch file >>>>> doesn't say those files should be deleted.  Anyway, please remove all >>>>> files/patch-*, and the port should make. >>>>> >>>>> >>>>> plasma >>>>> >>>>> On Sat, Sep 11, 2010 at 9:38 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> wrote: >>>>>> On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com> >>>>>> wrote: >>>>>>> Update to calibre-0.7.17 >>>>>> >>>>>> I'm not able to get this patch to apply cleanly.  I've also tried -p4 >>>>>> with the same result.  How do you apply this diff or is it reversed? >>>>>> >>>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>>>>> ~/calibre-0.7.17.diff >>>>>> Hmm...  Looks like a unified diff to me... >>>>>> The text leading up to this was: >>>>>> -------------------------- >>>>>> |diff -u calibre.orig/Makefile calibre/Makefile >>>>>> |--- calibre.orig/Makefile    2010-07-25 03:49:54.000000000 +0800 >>>>>> |+++ calibre/Makefile  2010-09-06 10:36:32.000000000 +0800 >>>>>> -------------------------- >>>>>> Patching file Makefile using Plan A... >>>>>> Hunk #1 succeeded at 6. >>>>>> Hunk #2 succeeded at 18. >>>>>> Hmm...  The next patch looks like a unified diff to me... >>>>>> The text leading up to this was: >>>>>> -------------------------- >>>>>> |diff -u calibre.orig/distinfo calibre/distinfo >>>>>> |--- calibre.orig/distinfo    2009-12-15 10:40:17.000000000 +0800 >>>>>> |+++ calibre/distinfo  2010-09-06 10:36:18.000000000 +0800 >>>>>> -------------------------- >>>>>> Patching file distinfo using Plan A... >>>>>> Hunk #1 succeeded at 1. >>>>>> Hmm...  The next patch looks like a unified diff to me... >>>>>> The text leading up to this was: >>>>>> -------------------------- >>>>>> |Common subdirectories: calibre.orig/files and calibre/files >>>>>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>>>>> |--- calibre.orig/pkg-plist   2009-12-15 10:40:17.000000000 +0800 >>>>>> |+++ calibre/pkg-plist  2010-09-06 11:27:20.000000000 +0800 >>>>>> -------------------------- >>>>>> Patching file pkg-plist using Plan A... >>>>>> Hunk #1 succeeded at 31. >>>>>> Hunk #2 succeeded at 64. >>>>>> Hunk #3 succeeded at 84. >>>>>> Hunk #4 succeeded at 106. >>>>>> Hunk #5 succeeded at 135. >>>>>> Hunk #6 succeeded at 153. >>>>>> Hunk #7 succeeded at 204. >>>>>> Hunk #8 succeeded at 224. >>>>>> Hunk #9 succeeded at 249. >>>>>> Hunk #10 succeeded at 284. >>>>>> Hunk #11 succeeded at 322. >>>>>> Hunk #12 succeeded at 337. >>>>>> Hunk #13 succeeded at 387. >>>>>> Hunk #14 succeeded at 472. >>>>>> Hunk #15 succeeded at 526. >>>>>> Hunk #16 succeeded at 559. >>>>>> Hunk #17 succeeded at 582. >>>>>> Hunk #18 succeeded at 598. >>>>>> Hunk #19 succeeded at 633. >>>>>> Hunk #20 succeeded at 651. >>>>>> Hunk #21 succeeded at 672. >>>>>> Hunk #22 succeeded at 690. >>>>>> Hunk #23 succeeded at 741. >>>>>> Hunk #24 succeeded at 781. >>>>>> Hunk #25 succeeded at 807. >>>>>> Hunk #26 succeeded at 833. >>>>>> Hunk #27 succeeded at 869. >>>>>> Hunk #28 succeeded at 890. >>>>>> Hunk #29 succeeded at 905. >>>>>> Hunk #30 succeeded at 948. >>>>>> Hunk #31 succeeded at 1053. >>>>>> Hunk #32 succeeded at 1130. >>>>>> Hunk #33 succeeded at 1177. >>>>>> Hunk #34 succeeded at 1199. >>>>>> Hunk #35 succeeded at 1217. >>>>>> Hunk #36 succeeded at 1289. >>>>>> Hunk #37 succeeded at 1318. >>>>>> Hunk #38 succeeded at 1622. >>>>>> Hunk #39 succeeded at 1807. >>>>>> Hunk #40 succeeded at 1913. >>>>>> Hunk #41 succeeded at 1942. >>>>>> Hunk #42 succeeded at 1958. >>>>>> Hunk #43 succeeded at 2046. >>>>>> Hunk #44 succeeded at 2070. >>>>>> Hunk #45 succeeded at 2090. >>>>>> Hunk #46 succeeded at 2128. >>>>>> Hunk #47 succeeded at 2146. >>>>>> Hmm...  Ignoring the trailing garbage. >>>>>> done >>>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>>>>> ===>  Vulnerability check disabled, database not found >>>>>> ===>  License check disabled, port has not defined LICENSE >>>>>> ===>  Found saved configuration for calibre-0.6.27 >>>>>> ===>  Extracting for calibre-0.7.17 >>>>>> => MD5 Checksum OK for calibre-0.7.17.tar.gz. >>>>>> => SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>>>>> ===>  Patching for calibre-0.7.17 >>>>>> ===>  Applying FreeBSD patches for calibre-0.7.17 >>>>>> Ignoring previously applied (or reversed) patch. >>>>>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>>>>> => Patch patch-setup___init__.py failed to apply cleanly. >>>>>> *** Error code 1 >>>>>> >>>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>>> *** Error code 1 >>>>>> >>>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>>> Exit 1 >>>>>> [tethys]:/usr/ports/deskutils/calibre-new> >>>>>> >>>> >>>> >> >>
Hi Rusty, Oh... I just use 'diff -u', maybe that's why my patch is not good. I'll try to remember that next time. Sorry about that. BTW, I think the url should be http://networking.ringofsaturn.com/Unix/createportpatch.php ? Missed an 'r' in the host name. plasma On Tue, Sep 14, 2010 at 10:54 AM, Rusty Nejdl <rnejdl@ringofsaturn.com> wro= te: > Plasma, > > I can't say I am very good either but... > > - I make a port-new folder, such as calibre-new. > - Make calibre-new port compile, install and deinstall as cleanly as > can be. > - diff -ruN calibre calibre-new > ~/calibre.patch > > I have a bit more info here: > http://networking.ringofsatun.com/Unix/createportpatch.php > > And then I should be able to apply that patch with a patch -p1. > > Rusty > > On Tue, 14 Sep 2010 10:50:32 +0800, plasmaball <plasmaball@gmail.com> > wrote: >> I'm not good at making patches. =A0Maybe you can teach me how to create = one? :) >> >> >> plasma >> >> On Tue, Sep 14, 2010 at 10:36 AM, Rusty Nejdl >> <rnejdl@ringofsaturn.com> wrote: >>> That means both you and I screwed up our patches unfortunately. =A0Let = me >>> test as you suggest and see how that works but ideally a patch should g= o >>> on what is there currently. >>> >>> Rusty >>> >>> On Tue, 14 Sep 2010 10:34:43 +0800, plasmaball <plasmaball@gmail.com> >>> wrote: >>>> Hi Rusty, >>>> >>>> I mean, you should remove all patch-* files under >>>> deskutils/calibre-new/files/ after the patch is applied. =A0I also did >>>> it manually when I use your patch before. :) >>>> >>>> >>>> plasma >>>> >>>> On Tue, Sep 14, 2010 at 10:29 AM, Rusty Nejdl >>>> <rnejdl@ringofsaturn.com> wrote: >>>>> Plasma, >>>>> >>>>> I'm just not getting the clean apply... >>>>> >>>>> [tethys]:/usr/ports/deskutils> sudo cp -R calibre/ calibre-new >>>>> [tethys]:/usr/ports/deskutils> cd !$ >>>>> cd calibre-new >>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make clean >>>>> =3D=3D=3D> =A0Cleaning for calibre-0.6.27_6 >>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>>>> ~/calibre-0.7.17.diff >>>>> Hmm... =A0Looks like a unified diff to me... >>>>> The text leading up to this was: >>>>> -------------------------- >>>>> |diff -u calibre.orig/Makefile calibre/Makefile >>>>> |--- calibre.orig/Makefile =A0 =A0 =A02010-07-25 03:49:54.000000000 += 0800 >>>>> |+++ calibre/Makefile =A0 2010-09-06 10:36:32.000000000 +0800 >>>>> -------------------------- >>>>> Patching file Makefile using Plan A... >>>>> Hunk #1 succeeded at 6. >>>>> Hunk #2 succeeded at 18. >>>>> Hmm... =A0The next patch looks like a unified diff to me... >>>>> The text leading up to this was: >>>>> -------------------------- >>>>> |diff -u calibre.orig/distinfo calibre/distinfo >>>>> |--- calibre.orig/distinfo =A0 =A0 =A02009-12-15 10:40:17.000000000 += 0800 >>>>> |+++ calibre/distinfo =A0 2010-09-06 10:36:18.000000000 +0800 >>>>> -------------------------- >>>>> Patching file distinfo using Plan A... >>>>> Hunk #1 succeeded at 1. >>>>> Hmm... =A0The next patch looks like a unified diff to me... >>>>> The text leading up to this was: >>>>> -------------------------- >>>>> |Common subdirectories: calibre.orig/files and calibre/files >>>>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>>>> |--- calibre.orig/pkg-plist =A0 =A0 2009-12-15 10:40:17.000000000 +08= 00 >>>>> |+++ calibre/pkg-plist =A02010-09-06 11:27:20.000000000 +0800 >>>>> -------------------------- >>>>> Patching file pkg-plist using Plan A... >>>>> Hunk #1 succeeded at 31. >>>>> Hunk #2 succeeded at 64. >>>>> Hunk #3 succeeded at 84. >>>>> Hunk #4 succeeded at 106. >>>>> Hunk #5 succeeded at 135. >>>>> Hunk #6 succeeded at 153. >>>>> Hunk #7 succeeded at 204. >>>>> Hunk #8 succeeded at 224. >>>>> Hunk #9 succeeded at 249. >>>>> Hunk #10 succeeded at 284. >>>>> Hunk #11 succeeded at 322. >>>>> Hunk #12 succeeded at 337. >>>>> Hunk #13 succeeded at 387. >>>>> Hunk #14 succeeded at 472. >>>>> Hunk #15 succeeded at 526. >>>>> Hunk #16 succeeded at 559. >>>>> Hunk #17 succeeded at 582. >>>>> Hunk #18 succeeded at 598. >>>>> Hunk #19 succeeded at 633. >>>>> Hunk #20 succeeded at 651. >>>>> Hunk #21 succeeded at 672. >>>>> Hunk #22 succeeded at 690. >>>>> Hunk #23 succeeded at 741. >>>>> Hunk #24 succeeded at 781. >>>>> Hunk #25 succeeded at 807. >>>>> Hunk #26 succeeded at 833. >>>>> Hunk #27 succeeded at 869. >>>>> Hunk #28 succeeded at 890. >>>>> Hunk #29 succeeded at 905. >>>>> Hunk #30 succeeded at 948. >>>>> Hunk #31 succeeded at 1053. >>>>> Hunk #32 succeeded at 1130. >>>>> Hunk #33 succeeded at 1177. >>>>> Hunk #34 succeeded at 1199. >>>>> Hunk #35 succeeded at 1217. >>>>> Hunk #36 succeeded at 1289. >>>>> Hunk #37 succeeded at 1318. >>>>> Hunk #38 succeeded at 1622. >>>>> Hunk #39 succeeded at 1807. >>>>> Hunk #40 succeeded at 1913. >>>>> Hunk #41 succeeded at 1942. >>>>> Hunk #42 succeeded at 1958. >>>>> Hunk #43 succeeded at 2046. >>>>> Hunk #44 succeeded at 2070. >>>>> Hunk #45 succeeded at 2090. >>>>> Hunk #46 succeeded at 2128. >>>>> Hunk #47 succeeded at 2146. >>>>> Hmm... =A0Ignoring the trailing garbage. >>>>> done >>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>>>> =3D=3D=3D> =A0Vulnerability check disabled, database not found >>>>> =3D=3D=3D> =A0License check disabled, port has not defined LICENSE >>>>> =3D=3D=3D> =A0Found saved configuration for calibre-0.6.27 >>>>> =3D=3D=3D> =A0Extracting for calibre-0.7.17 >>>>> =3D> MD5 Checksum OK for calibre-0.7.17.tar.gz. >>>>> =3D> SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>>>> =3D=3D=3D> =A0Patching for calibre-0.7.17 >>>>> =3D=3D=3D> =A0Applying FreeBSD patches for calibre-0.7.17 >>>>> Ignoring previously applied (or reversed) patch. >>>>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>>>> =3D> Patch patch-setup___init__.py failed to apply cleanly. >>>>> *** Error code 1 >>>>> >>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>> *** Error code 1 >>>>> >>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>> Exit 1 >>>>> [tethys]:/usr/ports/deskutils/calibre-new> >>>>> >>>>> On Tue, 14 Sep 2010 10:19:52 +0800, plasmaball <plasmaball@gmail.com> >>>>> wrote: >>>>>> Hi Rusty, >>>>>> >>>>>> The files directory should be empty. =A0I'm not sure why the patch f= ile >>>>>> doesn't say those files should be deleted. =A0Anyway, please remove = all >>>>>> files/patch-*, and the port should make. >>>>>> >>>>>> >>>>>> plasma >>>>>> >>>>>> On Sat, Sep 11, 2010 at 9:38 AM, Rusty Nejdl <rnejdl@ringofsaturn.co= m> wrote: >>>>>>> On Mon, 6 Sep 2010 11:48:17 +0800, plasmaball <plasmaball@gmail.com= > >>>>>>> wrote: >>>>>>>> Update to calibre-0.7.17 >>>>>>> >>>>>>> I'm not able to get this patch to apply cleanly. =A0I've also tried= -p4 >>>>>>> with the same result. =A0How do you apply this diff or is it revers= ed? >>>>>>> >>>>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo patch -p1 < >>>>>>> ~/calibre-0.7.17.diff >>>>>>> Hmm... =A0Looks like a unified diff to me... >>>>>>> The text leading up to this was: >>>>>>> -------------------------- >>>>>>> |diff -u calibre.orig/Makefile calibre/Makefile >>>>>>> |--- calibre.orig/Makefile =A0 =A0 =A02010-07-25 03:49:54.000000000= +0800 >>>>>>> |+++ calibre/Makefile =A0 2010-09-06 10:36:32.000000000 +0800 >>>>>>> -------------------------- >>>>>>> Patching file Makefile using Plan A... >>>>>>> Hunk #1 succeeded at 6. >>>>>>> Hunk #2 succeeded at 18. >>>>>>> Hmm... =A0The next patch looks like a unified diff to me... >>>>>>> The text leading up to this was: >>>>>>> -------------------------- >>>>>>> |diff -u calibre.orig/distinfo calibre/distinfo >>>>>>> |--- calibre.orig/distinfo =A0 =A0 =A02009-12-15 10:40:17.000000000= +0800 >>>>>>> |+++ calibre/distinfo =A0 2010-09-06 10:36:18.000000000 +0800 >>>>>>> -------------------------- >>>>>>> Patching file distinfo using Plan A... >>>>>>> Hunk #1 succeeded at 1. >>>>>>> Hmm... =A0The next patch looks like a unified diff to me... >>>>>>> The text leading up to this was: >>>>>>> -------------------------- >>>>>>> |Common subdirectories: calibre.orig/files and calibre/files >>>>>>> |diff -u calibre.orig/pkg-plist calibre/pkg-plist >>>>>>> |--- calibre.orig/pkg-plist =A0 =A0 2009-12-15 10:40:17.000000000 += 0800 >>>>>>> |+++ calibre/pkg-plist =A02010-09-06 11:27:20.000000000 +0800 >>>>>>> -------------------------- >>>>>>> Patching file pkg-plist using Plan A... >>>>>>> Hunk #1 succeeded at 31. >>>>>>> Hunk #2 succeeded at 64. >>>>>>> Hunk #3 succeeded at 84. >>>>>>> Hunk #4 succeeded at 106. >>>>>>> Hunk #5 succeeded at 135. >>>>>>> Hunk #6 succeeded at 153. >>>>>>> Hunk #7 succeeded at 204. >>>>>>> Hunk #8 succeeded at 224. >>>>>>> Hunk #9 succeeded at 249. >>>>>>> Hunk #10 succeeded at 284. >>>>>>> Hunk #11 succeeded at 322. >>>>>>> Hunk #12 succeeded at 337. >>>>>>> Hunk #13 succeeded at 387. >>>>>>> Hunk #14 succeeded at 472. >>>>>>> Hunk #15 succeeded at 526. >>>>>>> Hunk #16 succeeded at 559. >>>>>>> Hunk #17 succeeded at 582. >>>>>>> Hunk #18 succeeded at 598. >>>>>>> Hunk #19 succeeded at 633. >>>>>>> Hunk #20 succeeded at 651. >>>>>>> Hunk #21 succeeded at 672. >>>>>>> Hunk #22 succeeded at 690. >>>>>>> Hunk #23 succeeded at 741. >>>>>>> Hunk #24 succeeded at 781. >>>>>>> Hunk #25 succeeded at 807. >>>>>>> Hunk #26 succeeded at 833. >>>>>>> Hunk #27 succeeded at 869. >>>>>>> Hunk #28 succeeded at 890. >>>>>>> Hunk #29 succeeded at 905. >>>>>>> Hunk #30 succeeded at 948. >>>>>>> Hunk #31 succeeded at 1053. >>>>>>> Hunk #32 succeeded at 1130. >>>>>>> Hunk #33 succeeded at 1177. >>>>>>> Hunk #34 succeeded at 1199. >>>>>>> Hunk #35 succeeded at 1217. >>>>>>> Hunk #36 succeeded at 1289. >>>>>>> Hunk #37 succeeded at 1318. >>>>>>> Hunk #38 succeeded at 1622. >>>>>>> Hunk #39 succeeded at 1807. >>>>>>> Hunk #40 succeeded at 1913. >>>>>>> Hunk #41 succeeded at 1942. >>>>>>> Hunk #42 succeeded at 1958. >>>>>>> Hunk #43 succeeded at 2046. >>>>>>> Hunk #44 succeeded at 2070. >>>>>>> Hunk #45 succeeded at 2090. >>>>>>> Hunk #46 succeeded at 2128. >>>>>>> Hunk #47 succeeded at 2146. >>>>>>> Hmm... =A0Ignoring the trailing garbage. >>>>>>> done >>>>>>> [tethys]:/usr/ports/deskutils/calibre-new> sudo make >>>>>>> =3D=3D=3D> =A0Vulnerability check disabled, database not found >>>>>>> =3D=3D=3D> =A0License check disabled, port has not defined LICENSE >>>>>>> =3D=3D=3D> =A0Found saved configuration for calibre-0.6.27 >>>>>>> =3D=3D=3D> =A0Extracting for calibre-0.7.17 >>>>>>> =3D> MD5 Checksum OK for calibre-0.7.17.tar.gz. >>>>>>> =3D> SHA256 Checksum OK for calibre-0.7.17.tar.gz. >>>>>>> =3D=3D=3D> =A0Patching for calibre-0.7.17 >>>>>>> =3D=3D=3D> =A0Applying FreeBSD patches for calibre-0.7.17 >>>>>>> Ignoring previously applied (or reversed) patch. >>>>>>> 3 out of 3 hunks ignored--saving rejects to setup/__init__.py.rej >>>>>>> =3D> Patch patch-setup___init__.py failed to apply cleanly. >>>>>>> *** Error code 1 >>>>>>> >>>>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>>>> *** Error code 1 >>>>>>> >>>>>>> Stop in /usr/ports/deskutils/calibre-new. >>>>>>> Exit 1 >>>>>>> [tethys]:/usr/ports/deskutils/calibre-new> >>>>>>> >>>>> >>>>> >>> >>> > > --=20 plasma
Here's the lastest patch for this PR to update to 0.7.20. Apply by going to /usr/ports/deskutils and running sudo patch -p0 < /path/to/patch. Rusty
On Sun, 26 Sep 2010 08:53:21 -0500, Rusty Nejdl wrote: > Here's the lastest patch for this PR to update to 0.7.20. Apply by > going to /usr/ports/deskutils and running sudo patch -p0 < > /path/to/patch. > > Rusty I wanted to follow up on this and also send a new diff file to update now to 0.7.22. Can you please let me know the hold up over committing this update to the ports tree? I know some reservations had been expressed about the lack of USB support but I wasn't sure if that was the cause of this hold up or if other issues were found that perhaps I could fix. Sincerely, Rusty Nejdl
On Mon, 04 Oct 2010 12:59:25 -0500 Rusty Nejdl <rnejdl@ringofsaturn.com> mentioned: > On Sun, 26 Sep 2010 08:53:21 -0500, Rusty Nejdl wrote: > > Here's the lastest patch for this PR to update to 0.7.20. Apply by > > going to /usr/ports/deskutils and running sudo patch -p0 < > > /path/to/patch. > > > > Rusty > > I wanted to follow up on this and also send a new diff file to update > now to 0.7.22. Can you please let me know the hold up over committing > this update to the ports tree? I know some reservations had been > expressed about the lack of USB support but I wasn't sure if that was > the cause of this hold up or if other issues were found that perhaps I > could fix. The only issue is the USB. The USB should be fixed prior update. I still had not find time to do it. :-( -- Stanislav Sedov ST4096-RIPE
stas 2010-10-07 09:50:40 UTC FreeBSD ports repository Modified files: deskutils/calibre Makefile distinfo pkg-plist Added files: deskutils/calibre/files patch-src_calibre_devices_scanner.py Removed files: deskutils/calibre/files patch-setup___init__.py patch-setup_extensions.py patch-setup_install.py patch-src_calibre___init__.py patch-src_calibre_constants.py patch-src_calibre_devices_libusb.c patch-src_calibre_devices_libusb.py patch-src_calibre_devices_usbms_device.py patch-src_calibre_ebooks_html_input.py patch-src_calibre_ebooks_lrf_html_table_as_image.py patch-src_calibre_ebooks_pdf_pdftohtml.py patch-src_calibre_ebooks_pdf_writer.py patch-src_calibre_gui2___init__.py patch-src_calibre_gui2_dialogs_metadata_single.py patch-src_calibre_gui2_lrf_renderer_main.py patch-src_calibre_gui2_main.py patch-src_calibre_gui2_viewer_documentview.py patch-src_calibre_gui2_viewer_main.py patch-src_calibre_gui2_viewer_printing.py patch-src_calibre_linux.py patch-src_calibre_utils_help2man.py Log: - Update to 0.7.22. With this update the USB functionality should still continue to work, but device enumeration now requires root privileges. Also mountpoint detection and automounting doesn't work. PR: ports/148831 Submitted by: Rusty Nejdl <rnejdl@tethys.ringofsaturn.com> (based on) Revision Changes Path 1.11 +9 -6 ports/deskutils/calibre/Makefile 1.4 +3 -3 ports/deskutils/calibre/distinfo 1.2 +0 -30 ports/deskutils/calibre/files/patch-setup___init__.py (dead) 1.4 +0 -46 ports/deskutils/calibre/files/patch-setup_extensions.py (dead) 1.2 +0 -46 ports/deskutils/calibre/files/patch-setup_install.py (dead) 1.2 +0 -11 ports/deskutils/calibre/files/patch-src_calibre___init__.py (dead) 1.3 +0 -20 ports/deskutils/calibre/files/patch-src_calibre_constants.py (dead) 1.2 +0 -11 ports/deskutils/calibre/files/patch-src_calibre_devices_libusb.c (dead) 1.2 +0 -15 ports/deskutils/calibre/files/patch-src_calibre_devices_libusb.py (dead) 1.1 +82 -0 ports/deskutils/calibre/files/patch-src_calibre_devices_scanner.py (new) 1.2 +0 -38 ports/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py (dead) 1.2 +0 -29 ports/deskutils/calibre/files/patch-src_calibre_ebooks_html_input.py (dead) 1.2 +0 -18 ports/deskutils/calibre/files/patch-src_calibre_ebooks_lrf_html_table_as_image.py (dead) 1.2 +0 -20 ports/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_pdftohtml.py (dead) 1.3 +0 -11 ports/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py (dead) 1.3 +0 -20 ports/deskutils/calibre/files/patch-src_calibre_gui2___init__.py (dead) 1.2 +0 -22 ports/deskutils/calibre/files/patch-src_calibre_gui2_dialogs_metadata_single.py (dead) 1.2 +0 -29 ports/deskutils/calibre/files/patch-src_calibre_gui2_lrf_renderer_main.py (dead) 1.3 +0 -11 ports/deskutils/calibre/files/patch-src_calibre_gui2_main.py (dead) 1.2 +0 -11 ports/deskutils/calibre/files/patch-src_calibre_gui2_viewer_documentview.py (dead) 1.2 +0 -20 ports/deskutils/calibre/files/patch-src_calibre_gui2_viewer_main.py (dead) 1.2 +0 -11 ports/deskutils/calibre/files/patch-src_calibre_gui2_viewer_printing.py (dead) 1.3 +0 -41 ports/deskutils/calibre/files/patch-src_calibre_linux.py (dead) 1.2 +0 -19 ports/deskutils/calibre/files/patch-src_calibre_utils_help2man.py (dead) 1.4 +877 -184 ports/deskutils/calibre/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!