Date: 13 Apr 2003 15:27:12 -0400 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> Cc: FreeBSD GNOME Users <gnome@FreeBSD.org> Subject: Re: GNOME 2.3.0 Message-ID: <1050262031.10391.2.camel@shumai.marcuscom.com> In-Reply-To: <20030413092541.GA710@martin.kleinerdrache.org> References: <1050102076.363.84.camel@gyros> <20030412165646.GA1115@martin.kleinerdrache.org> <1050173173.72359.0.camel@shumai.marcuscom.com> <20030413092541.GA710@martin.kleinerdrache.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-9IAVW9QZ8I2avLmjjXre
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On Sun, 2003-04-13 at 05:25, Martin Klaffenboeck wrote:
> 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?
> >=20
> > It's now under the portstools module.
>=20
> There seems to be something wrong...
>=20
> =3D=3D=3D> 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=20
> file or directory
> =3D=3D=3D> Merging done.
>=20
> I just copied the marcusmerge file changed one line:
>=20
> So now I created a patch from 'cvs diff marcusmerge':
>=20
> martin# cvs diff marcusmerge
> Index: marcusmerge
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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
>=20
> That works now.
Committed, thanks!
Joe
>=20
> Martin
--=20
Joe Marcus Clarke
FreeBSD GNOME Team :: marcus@FreeBSD.org
http://www.FreeBSD.org/gnome
--=-9IAVW9QZ8I2avLmjjXre
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD4DBQA+mboPb2iPiv4Uz4cRAiOnAJjDn4Y3MEQnIXx6KeO4myDaoEUJAJ9nmMQH
IIRL6b5bPK/tgxXxXiEDyQ==
=+o4R
-----END PGP SIGNATURE-----
--=-9IAVW9QZ8I2avLmjjXre--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1050262031.10391.2.camel>