From owner-freebsd-gnome@FreeBSD.ORG Sun Apr 13 12:27:20 2003 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39ABB37B401 for ; Sun, 13 Apr 2003 12:27:20 -0700 (PDT) Received: from ms-smtp-02.southeast.rr.com (ms-smtp-02.southeast.rr.com [24.93.67.83]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F77F43F85 for ; Sun, 13 Apr 2003 12:27:19 -0700 (PDT) (envelope-from marcus@FreeBSD.org) Received: from mail4.nc.rr.com (fe4 [24.93.67.51])h3DJPKgw013263; Sun, 13 Apr 2003 15:25:21 -0400 (EDT) Received: from creme-brulee.marcuscom.com ([66.57.17.158]) by mail4.nc.rr.com with Microsoft SMTPSVC(5.5.1877.757.75); Sun, 13 Apr 2003 15:29:08 -0400 Received: from [192.168.1.4] (shumai.marcuscom.com [192.168.1.4]) h3DJQKaa073449; Sun, 13 Apr 2003 15:26:21 -0400 (EDT) (envelope-from marcus@FreeBSD.org) From: Joe Marcus Clarke To: Martin Klaffenboeck 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> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-9IAVW9QZ8I2avLmjjXre" Organization: FreeBSD, Inc. Message-Id: <1050262031.10391.2.camel@shumai.marcuscom.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.4 Date: 13 Apr 2003 15:27:12 -0400 X-Spam-Status: No, hits=-39.4 required=5.0 tests=BAYES_01,EMAIL_ATTRIBUTION,IN_REP_TO,PGP_SIGNATURE_2, QUOTED_EMAIL_TEXT,QUOTE_TWICE_1,REFERENCES, REPLY_WITH_QUOTES autolearn=ham version=2.50 X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) cc: FreeBSD GNOME Users Subject: Re: GNOME 2.3.0 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2003 19:27:20 -0000 --=-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--