From owner-freebsd-gnome@FreeBSD.ORG Mon May 26 18:42:12 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 E37CB37B401 for ; Mon, 26 May 2003 18:42:12 -0700 (PDT) Received: from ms-smtp-03.southeast.rr.com (ms-smtp-03.southeast.rr.com [24.93.67.84]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09C3143F3F for ; Mon, 26 May 2003 18:42:12 -0700 (PDT) (envelope-from marcus@FreeBSD.org) Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158])h4R1eaZo029628; Mon, 26 May 2003 21:40:37 -0400 (EDT) Received: from [192.168.1.4] (shumai.marcuscom.com [192.168.1.4]) h4R1eOV8038140; Mon, 26 May 2003 21:40:24 -0400 (EDT) (envelope-from marcus@FreeBSD.org) From: Joe Marcus Clarke To: "P. U. Kruppa" In-Reply-To: <20030527024811.U736@small.pukruppa.de> References: <1053712093.313.39.camel@gyros> <1053728774.966.0.camel@gyros> <20030527024811.U736@small.pukruppa.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-gPPzhoQErq2wA6Itx6RI" Organization: FreeBSD, Inc. Message-Id: <1053999722.1171.7.camel@shumai.marcuscom.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.3.92 (Preview Release) Date: 26 May 2003 21:42:02 -0400 X-Spam-Status: No, hits=-8.9 required=5.0 tests=BAYES_01,EMAIL_ATTRIBUTION,IN_REP_TO,PGP_SIGNATURE_2, QUOTED_EMAIL_TEXT,REFERENCES,REPLY_WITH_QUOTES autolearn=ham version=2.55 X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: FreeBSD GNOME Users Subject: Re: HEADS UP TESTERS: New marcusmerge script 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: Tue, 27 May 2003 01:42:13 -0000 --=-gPPzhoQErq2wA6Itx6RI Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Mon, 2003-05-26 at 21:03, P. U. Kruppa wrote: > > > > Definitely! I just committed it. Everyone, be sure to download the > > updated version. Thanks! > > > > Joe > Hmm (?!), >=20 > usually I cvsup -CURRENT to src-all and ports-all - all in one > supfile. Franz's modifications assume a separate ports supfile, but it should work with a combined one. > Then, when I have got some time left (p.ex. yesterday), I do a marcusmerg= e - > which seems to work fine. >=20 > But I think I didn't get the point, how to integrate both > processes. I left the > SUPFILE=3D > line blank. > Could you please re-explain slowly? You probably don't want to use this SUPFILE functionality. You're probably better off doing things the way you always did. Franz's modifications are a convenience for people that want to do their port upgrade/marcusmerge in one fell swoop. Joe >=20 > Thanks, >=20 > Uli. >=20 >=20 > +-----------------------------------+ > | Peter Ulrich Kruppa | > | - Wuppertal - | > | Germany | > +-----------------------------------+ --=20 Joe Marcus Clarke FreeBSD GNOME Team :: marcus@FreeBSD.org http://www.FreeBSD.org/gnome --=-gPPzhoQErq2wA6Itx6RI Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (FreeBSD) iD8DBQA+0sJqb2iPiv4Uz4cRAr4qAJ9SyKt+Tv/u5cvPJyc6zpTKn1P4ewCfYHsU zxIMHnxVUQYkmjZ/KJjXqEo= =efe3 -----END PGP SIGNATURE----- --=-gPPzhoQErq2wA6Itx6RI--