From owner-freebsd-gnome@FreeBSD.ORG Sun Apr 13 02:25:44 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 9FDF837B401 for ; Sun, 13 Apr 2003 02:25:44 -0700 (PDT) Received: from httpd.terions.de (static62-99-146-055.adsl.inode.at [62.99.146.55]) by mx1.FreeBSD.org (Postfix) with SMTP id 5CF9943FBF for ; Sun, 13 Apr 2003 02:25:42 -0700 (PDT) (envelope-from martin.klaffenboeck@gmx.at) Received: (qmail 1185 invoked from network); 13 Apr 2003 09:25:42 -0000 Received: from unknown (HELO martin.kleinerdrache.org) (127.0.0.1) by loopback with SMTP; 13 Apr 2003 09:25:42 -0000 Date: Sun, 13 Apr 2003 11:25:41 +0200 From: Martin Klaffenboeck To: Joe Marcus Clarke Message-ID: <20030413092541.GA710@martin.kleinerdrache.org> References: <1050102076.363.84.camel@gyros> <20030412165646.GA1115@martin.kleinerdrache.org> <1050173173.72359.0.camel@shumai.marcuscom.com> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=ISO-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1050173173.72359.0.camel@shumai.marcuscom.com>; from marcus@FreeBSD.org on Sa, Apr 12, 2003 at 20:46:13 +0200 X-Mailer: Balsa 2.0.10 Lines: 55 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 09:25:44 -0000 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