From owner-freebsd-gnome Mon Jan 20 11:31:11 2003 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 899CC37B405 for ; Mon, 20 Jan 2003 11:31:09 -0800 (PST) Received: from httpd.terions.de (static62-99-146-055.adsl.inode.at [62.99.146.55]) by mx1.FreeBSD.org (Postfix) with SMTP id 8EE8843F1E for ; Mon, 20 Jan 2003 11:31:05 -0800 (PST) (envelope-from martin.klaffenboeck@gmx.at) Received: (qmail 86100 invoked from network); 20 Jan 2003 19:31:03 -0000 Received: from unknown (HELO martin.kleinerdrache.org) (127.0.0.1) by loopback with SMTP; 20 Jan 2003 19:31:03 -0000 Date: Mon, 20 Jan 2003 20:31:02 +0100 From: Martin Klaffenboeck To: "P. U. Kruppa" <520023893678-0001@t-online.de> Cc: Joe Marcus Clarke , "P. U. Kruppa" <520023893678-0001@t-online.de>, Franz Klammer , freebsd-gnome@FreeBSD.ORG Subject: Re: Howto do ./marcusmerge ? Message-ID: <20030120193102.GA572@martin.kdrache.org> References: <20030117135722.V34734@small.pukruppa.de> <20030119002031.K16254@small.pukruppa.de> <1042933050.7820.52.camel@shumai.marcuscom.com> <20030120191756.A1287@small.pukruppa.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="NzB8fVQJ5HfG6fxh" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20030120191756.A1287@small.pukruppa.de>; from 520023893678-0001@t-online.de on Mo, Jan 20, 2003 at 20:39:52 +0100 X-Mailer: Balsa 2.0.4 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --NzB8fVQJ5HfG6fxh Content-Type: text/plain; format=flowed; charset=ISO-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Am 2003.01.20 20:39 schrieb(en) P. U. Kruppa: > I think my mistake was setting > SRCDIR="/usr/ports" > This time I put in > SRCDIR="/tmp/gnome2" I had another person who set this wrong. So I added an other patch for the marcusmerge script. Please have a look at it when you commit this, because I didn't test it. Martin --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="marcusmerge.diff" --- marcusmerge.orig Mon Jan 20 20:21:55 2003 +++ marcusmerge Mon Jan 20 20:27:51 2003 @@ -2,12 +2,19 @@ # $Id: marcusmerge,v 1.5 2003/01/18 20:59:41 marcus Exp $ -SRCDIR= -DESTDIR="/usr/ports" -VERBOSE="yes" +SRCDIR= # The path to the marcuscom ports. +DESTDIR="/usr/ports" # The path to the official ports collection. +VERBOSE="yes" # If you want verbose output. + +# You don't have to change anything beyond this line. if [ -z ${SRCDIR} ]; then echo "You did not set SRCDIR in this script; aborting..." + exit 1 +fi + +if [ ${SRCDIR} = ${DESTDIR} ]; then + printf "Your SRCDIR is set to the same path as your DESTDIR.\nPlease set it to a path where we can store the marcuscom ports.\n\n" exit 1 fi --NzB8fVQJ5HfG6fxh-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message