- Update to 1.1.15.5144 Port maintainer (glarkin@sourcehosting.net) is cc'd. Generated with FreeBSD Port Tools 0.77
State Changed From-To: open->feedback hi, Can you please check the patch? ... It gives an error Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- | |--- cakephp-1.1.15.5144.patch begins here --- |diff -ruN --exclude=CVS /usr/ports/www/cakephp.orig/Makefile /usr/ports/www/cakephp/Makefile |--- /usr/ports/www/cakephp.orig/Makefile Fri Apr 6 14:31:13 2007 |+++ /usr/ports/www/cakephp/Makefile Fri Jun 29 15:59:10 2007 -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 6. 1 out of 1 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 -ruN --exclude=CVS /usr/ports/www/cakephp.orig/distinfo /usr/ports/www/cakephp/distinfo |--- /usr/ports/www/cakephp.orig/distinfo Fri Apr 6 12:42:22 2007 |+++ /usr/ports/www/cakephp/distinfo Fri Jun 29 15:59:28 2007 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1 with fuzz 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN --exclude=CVS /usr/ports/www/cakephp.orig/pkg-plist /usr/ports/www/cakephp/pkg-plist |--- /usr/ports/www/cakephp.orig/pkg-plist Fri Apr 6 14:31:23 2007 |+++ /usr/ports/www/cakephp/pkg-plist Fri Jun 29 16:30:12 2007 -------------------------- Patching file pkg-plist using Plan A... Hunk #1 failed at 8. Hunk #2 failed at 163. Hunk #3 failed at 183. Hunk #4 failed at 212. Hunk #5 failed at 287. 5 out of 5 hunks failed--saving rejects to pkg-plist.rej Hmm... Ignoring the trailing garbage. Thanks.
> -----Original Message----- > From: Martin Wilke [mailto:miwi@FreeBSD.org] > Sent: Thursday, July 05, 2007 5:40 PM > To: glarkin@sourcehosting.net > Subject: Re: ports/114138: [PATCH] www/cakephp: update to 1.1.15.5144 > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On Thu, 5 Jul 2007 14:23:42 -0400 > "Greg Larkin" <glarkin@sourcehosting.net> wrote: > > |Hi Martin, > | > |Please accept my apologies - I must have generated the patch > against an > |intermediate version of the port that I was working on several weeks > |ago. I'll update to the committed version of the port directory and > |recreate the patch. > > Hi Greg, > > Thanks, please resend a followup to this pr i'll then handle > this pr :). > > - - Martin > > - -- > Martin Wilke | irc.unixfreunde.de #bsd > miwi@FreeBSD.org | miwi@unixfreunde.de > FreeBSD Committer | Power to Serve > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.4 (FreeBSD) > > iD8DBQFGjWU/FwpycAVoI1MRAjtmAKCjVZCVUf+lykGptkeUxVwxJwyNKACgpKWM > IbEBa7FsVSHpGM9cHt3xch4= > =WVWw > -----END PGP SIGNATURE----- > Hi Martin, I have attached a new patch that was generated against the correct base. Let me know if you see any problems with this one. Thank you! Regards, Greg
miwi 2007-07-06 06:45:16 UTC FreeBSD ports repository Modified files: www/cakephp Makefile distinfo pkg-plist www/cakephp/files cakephp-development-cgi.conf.in cakephp-development.conf.in cakephp-production-cgi.conf.in cakephp-production.conf.in pkg-message.in Log: - Update to 1.1.15.5144 - Use WWWDIR PR: 114138 Submitted by: Greg Larkin <glarkin@sourcehosting.net> (maintainer) Revision Changes Path 1.4 +8 -9 ports/www/cakephp/Makefile 1.2 +3 -3 ports/www/cakephp/distinfo 1.2 +1 -1 ports/www/cakephp/files/cakephp-development-cgi.conf.in 1.2 +1 -1 ports/www/cakephp/files/cakephp-development.conf.in 1.2 +1 -1 ports/www/cakephp/files/cakephp-production-cgi.conf.in 1.2 +1 -1 ports/www/cakephp/files/cakephp-production.conf.in 1.3 +1 -1 ports/www/cakephp/files/pkg-message.in 1.3 +290 -252 ports/www/cakephp/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: feedback->closed Committed. Thanks!