Date: Sun, 13 Apr 2003 11:25:41 +0200 From: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: FreeBSD GNOME Users <gnome@FreeBSD.org> Subject: Re: GNOME 2.3.0 Message-ID: <20030413092541.GA710@martin.kleinerdrache.org> In-Reply-To: <1050173173.72359.0.camel@shumai.marcuscom.com>; from marcus@FreeBSD.org on Sa, Apr 12, 2003 at 20:46:13 %2B0200 References: <1050102076.363.84.camel@gyros> <20030412165646.GA1115@martin.kleinerdrache.org> <1050173173.72359.0.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Am 2003.04.12 20:46 schrieb(en) Joe Marcus Clarke:
> On Sat, 2003-04-12 at 12:56, Martin Klaffenboeck wrote:
> > Am 2003.04.12 01:01 schrieb(en) Joe Marcus Clarke:
> > > As many of you have no doubt seen, GNOME 2.3.0 is out. I have
> begun
> > > work on it in the usual place. I have updated marcusmerge a bunch
> to
> > > handle things such as command line arguments and merging Mk files.
> I
> > > urge you to download the latest copy if you're going to be doing
> 2.3.x
> > > testing. I still have a ways to go with this port, but I will let
> > > everyone know when it's done. If anyone wants to join in and
> help,
> > > let
> > > me know.
> >
> > martin# cvs up
> > cvs server: Updating .
> > cvs server: cannot open directory
> /space/cvs/marcuscom-cvs/marcusmerge:
> > No such file or directory
> > cvs server: skipping directory
> >
> > Have you changed something?
>
> It's now under the portstools module.
There seems to be something wrong...
===> Merging files to the ports directory
/root/marcus/ports --> /usr/ports
cp: /root/marcus/ports/Mk//root/marcus/ports/Mk/bsd.gnome.mk: No such
file or directory
===> Merging done.
I just copied the marcusmerge file changed one line:
So now I created a patch from 'cvs diff marcusmerge':
martin# cvs diff marcusmerge
Index: marcusmerge
===================================================================
RCS file: /space/cvs/marcuscom-cvs/portstools/marcusmerge,v
retrieving revision 1.10
diff -r1.10 marcusmerge
86c86
< cp ${SRCDIR}/Mk/${mk} ${DESTDIR}/Mk
---
> cp ${mk} ${DESTDIR}/Mk
That works now.
Martin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030413092541.GA710>