Date: Fri, 17 Jan 2003 16:17:10 +0100 From: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> To: Franz Klammer <klammer@webonaut.com> Cc: "P. U. Kruppa" <520023893678-0001@t-online.de>, freebsd-gnome@FreeBSD.ORG Subject: Re: Howto do ./marcusmerge ? Message-ID: <20030117151710.GC337@martin.kdrache.org> In-Reply-To: <1042814311.14047.21.camel@ds9.webonaut.com>; from klammer@webonaut.com on Fr, Jan 17, 2003 at 15:38:31 %2B0100 References: <20030117135722.V34734@small.pukruppa.de> <1042814311.14047.21.camel@ds9.webonaut.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; format=flowed; charset=ISO-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Am 2003.01.17 15:38 schrieb(en) Franz Klammer:
> Hi!
>
> First you must check out the ports module.
> SRCDIR is the directory where you find all
> the gnome 2.1-ports.
Hm. I'm using a different version of marcusmerge, maybe you can have a
look at it and merge some parts of it to your marcusmerge script?
Here is my diff.
Martin
--NzB8fVQJ5HfG6fxh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="marcusmerge.diff"
--- marcusmerge.orig Fri Jan 17 15:48:43 2003
+++ marcusmerge Fri Jan 17 16:14:55 2003
@@ -2,18 +2,28 @@
# $Id: marcusmerge,v 1.2 2003/01/12 21:59:03 marcus Exp $
-SRCDIR="/home/marcus/src/marcuscom-cvs/ports"
+SRCDIR=`pwd`/"ports"
DESTDIR="/usr/ports"
VERBOSE="yes"
-echo "${SRCDIR} --> ${DESTDIR}"
-echo
-
if [ ! -d ${SRCDIR} ]; then
- printf "Source directory does not exist! Please checkout the ports module from\nhttp://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi\n"
- exit 1
+ printf "First we have to checkout the ports module from\nhttp://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi\nPlease type 'anoncvs' as your password.\n\n"
+ cvs -d:pserver:anonymous@creme-brulee.marcuscom.com:/space/cvs/marcuscom-cvs login
+ echo "===> Checking out the ports module."
+ cvs -z3 -d:pserver:anonymous@creme-brulee.marcuscom.com:/space/cvs/marcuscom-cvs co ports
+ echo "===> Checkout done."
+fi
+
+if [ $1 = "-u" ]; then
+ echo "===> Updateing the marcus ports tree"
+ cd ${SRCDIR}
+ cvs -z3 update
+ echo "===> Updateing done."
fi
+echo "===> Merging files to the ports directory ..."
+echo "${SRCDIR} --> ${DESTDIR}"
+
for category in `ls -1 ${SRCDIR}`; do
if [ ${category} = "CVS" ]; then
continue
@@ -43,3 +53,5 @@
tar -xf - -C ${DESTDIR}/${category}
done
done
+
+echo "===> Merging done."
--NzB8fVQJ5HfG6fxh--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030117151710.GC337>