Date: Tue, 3 Jun 2003 01:59:04 +0200 From: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> To: Joe Marcus Clarke <marcus@marcuscom.com> Cc: FreeBSD GNOME Users <gnome@freebsd.org> Subject: Re: marcusmerge-update for the lazy Message-ID: <20030602235904.GE41024@martin.kleinerdrache.org> In-Reply-To: <1054594170.47675.31.camel@shumai.marcuscom.com>; from marcus@marcuscom.com on Di, Jun 03, 2003 at 00:49:30 %2B0200 References: <1054475195.81833.21.camel@sisko.webonaut.com> <1054594170.47675.31.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--CE+1k2dSO48ffgeK
Content-Type: text/plain; format=flowed; charset=ISO-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Am 2003.06.03 00:49 schrieb(en) Joe Marcus Clarke:
> On Sun, 2003-06-01 at 09:46, Franz Klammer wrote:
> > attached a update for the lazy tester (like me) ;-)
> >
> > - add option -a as shortcut for -u -l -p
> > - save `basename $0` in $SCRIPTNAME
> > - if exists include /usr/local/etc/${SCRIPTNAME}.cfg
> > to avoid editing the script after every update
> >
> > also changed:
> > - use the real scriptname in the usage: message
> > - respect ${VERBOSE} when doing cvsup
I've added an autodetect mechanism for the SUPFILE, where the supfile
will be the supfile which 'make update' in the ${PORTSDIR} would use.
Martin
--
If you've got an idea and need help, ICQ: 72997139
or just need general encouragement, MSN: kleinerdrache@gmx.at
write me a message. ;-) Yahoo-Messenger: walking2martin
AIM: littlewizzard
--CE+1k2dSO48ffgeK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="marcusmerge.diff"
--- marcusmerge.orig Tue Jun 3 01:46:59 2003
+++ marcusmerge Tue Jun 3 01:57:02 2003
@@ -5,7 +5,7 @@
SRCDIR= # The path to the MarcusCom ports.
DESTDIR="/usr/ports" # The path to the official ports collection.
VERBOSE="no" # If you want verbose output.
-SUPFILE= # The path your ports-supfile.
+SUPFILE= # The path your ports-supfile (default: auto).
MODULE="ports" # CVS module to checkout.
# You do not have to change anything beyond this line.
@@ -83,6 +83,9 @@
fi
if [ ${update_main} = "yes" ]; then
+ if [ -z ${SUPFILE} ]; then
+ SUPFILE=`cd ${DESTDIR} ; make -V PORTSSUPFILE`
+ fi
if [ -z ${SUPFILE} ]; then
printf "Update of main ports tree requested but you forgot\nto set SUPFILE in this script; aborting...\n\n"
exit 1
--CE+1k2dSO48ffgeK--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030602235904.GE41024>