x11-fm/nautilus@marcusmerge no longer need one of the patchces

[Yoshihiro Ota]

Yes, it seems that was the problem.

I wasn't specifying -u to marcusmerge.
I just started experimenting with it and havn't
got a full cycle, yet.

Thanks,
Hiro

On Tue, 27 Feb 2007 14:49:22 -0600
"Jeremy Messenger" <mezz7 at cox.net> wrote:

> On Mon, 26 Feb 2007 22:39:18 -0600, Yoshihiro Ota <ota at j.email.ne.jp>  
> wrote:
> 
> > I got the following error compiling nautilus from marcusmerge.
> > Its version is nautilus-2.17.91.
> >
> > After removing patch-libnautilus-private_nautilus-emblem-utils.c from  
> > files, "make build" was successful.
> 
> Your MC ports tree are out of date. ahze has fixed it back in Feb 14th.  
> The marcuscom has nautilus 2.17.92 right now.
> 
> Cheers,
> Mezz
> 
> > Regards,
> > Hiro
> >
> >
> > ===>  Found saved configuration for nautilus-2.17.91
> > ===>  Extracting for nautilus-2.17.91
> > => MD5 Checksum OK for gnome2/nautilus-2.17.91.tar.bz2.
> > => SHA256 Checksum OK for gnome2/nautilus-2.17.91.tar.bz2.
> > ===>  Patching for nautilus-2.17.91
> > ===>   nautilus-2.17.91 depends on file: /usr/local/bin/libtool - found
> > ===>  Applying FreeBSD patches for nautilus-2.17.91
> > Ignoring previously applied (or reversed) patch.
> > 1 out of 1 hunks ignored--saving rejects to  
> > libnautilus-private/nautilus-emblem-utils.c.rej
> > => Patch patch-libnautilus-private_nautilus-emblem-utils.c failed to  
> > apply cleanly.
> > => Patch(es) patch-Makefile.in applied cleanly.
> > *** Error code 1
> >
> > Stop in /usr/ports/x11-fm/nautilus.
> 
> 
> -- 
> mezz7 at cox.net  -  mezz at FreeBSD.org
> FreeBSD GNOME Team  -  FreeBSD Multimedia Hat (ports, not src)
> http://www.FreeBSD.org/gnome/  -  gnome at FreeBSD.org
> http://wiki.freebsd.org/multimedia  -  multimedia at FreeBSD.org