Skip site navigation (1)Skip section navigation (2)
Date:      11 Mar 2003 21:14:13 +0100
From:      Franz Klammer <klammer@webonaut.com>
To:        Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Cc:        FreeBSD-gnome <gnome@freebsd.org>, Joe Marcus Clarke <marcus@marcuscom.com>
Subject:   Re: net/gnomeicu2 update to 0.99
Message-ID:  <1047413652.635.117.camel@ds9.webonaut.com>
In-Reply-To: <20030311185058.GA34218@martin.kdrache.org>
References:  <1047393785.1711.4.camel@asa.gascom.net.ru> <1047395189.635.18.camel@ds9.webonaut.com> <20030311185058.GA34218@martin.kdrache.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--=-5RvbAOMeNd3YMfNCCap2
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Am Di, 2003-03-11 um 19.50 schrieb Martin Klaffenboeck:
> Am 2003.03.11 16:06 schrieb(en) Franz Klammer:
> > hi!
> > 
> > while the port-tree-freeze-days you can donwload the
> > gnome2-diffs form http://www.marcuscom.com/downloads/freeze/
> > 
> > here's also the diff for gnomeicu2 ;-)
> 
> Is there something like marcusmerge for the freeze patchs?
> 

no! but if you brave enough, try this: ;-)

- make the ports category-structure in your home-directory
- copy the diffs into the category-directories e.g.:
	~/ports/www/galeon2.diff
	~/ports/x11/gnomeapplets2.diff

- try the attached marcusfreeze
    please edit following variables:
    - SUPFILE
    - SRCDIR


========== !! ATTENTION -- ATTENTION !! ==========
mf_example shows only what the script want to do, 
every action well be only echo'ed.

marcusfreeze are doing the real thing!!
BE AWARE, : i didn't test it!!!
========== !! ATTENTION -- ATTENTION !! ==========

joe, what did you think about this script??

franz.

> Martin
> 
> > franz.
> > 
> > 
> > Am Di, 2003-03-11 um 15.43 schrieb Akifyev Sergey:
> > > 	I need Gnomeicu2 update to 0.99, because of problem with
> > reading
> > > cyrillic characters in RTF-encoded messages (which is used by most
> > of my
> > > friends). So I made this update... :) It's available from:
> > >
> > > ftp://ftp.gascom.ru/pub/GNOME2/ports/gnomeicu.tgz
> > > md5 = e842370963c0a56b451e57933381474e
> > --
> > WEBONAUT.com
> > http://webonaut.com
> > mailto:klammer@webonaut.com
> > 
> > 
> > 
> > To Unsubscribe: send mail to majordomo@FreeBSD.org
> > with "unsubscribe freebsd-gnome" in the body of the message
> > 
> > 
> > 
-- 
WEBONAUT.com
http://webonaut.com
mailto:klammer@webonaut.com


--=-5RvbAOMeNd3YMfNCCap2
Content-Disposition: attachment; filename=mf_example
Content-Type: text/x-sh; name=mf_example; charset=ISO8859-1
Content-Transfer-Encoding: 7bit

#!/bin/sh

# $Id: marcusmerge,v 1.6 2003/01/22 22:57:02 marcus Exp $

SRCDIR="/home/klammer/src/freeze"	# The path to the MarcusCom ports.
DESTDIR="/usr/ports"	# The path to the official ports collection.
VERBOSE="yes"		# If you want verbose output.
SUPFILE="/root/ports-supfile"

# You do not 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

#if [ ! -d ${SRCDIR} ]; then
#fi

echo "===> Deleting the the old ports directories"
for category in `ls -1 ${SRCDIR}`; do
  for difffile in `ls -1 ${SRCDIR}/${category}/*.diff`; do
    port=`basename ${difffile%.diff}`
    echo "deleting:  ${DESTDIR}/${category}/${port}"
      if [ -d ${DESTDIR}/${category}/${port} ]; then
	echo "rm -R ${DESTDIR}/${category}/${port}"
      fi
  done
done

echo "===> run cvsup"
echo "cvsup -g ${SUPFILE}"

echo "===> Merging freeze-diffs to the ports directory"
echo "${SRCDIR} --> ${DESTDIR}"

for category in `ls -1 ${SRCDIR}`; do
  for difffile in `ls -1 ${SRCDIR}/${category}/*.diff`; do
    port=`basename ${difffile%.diff}`

    if [ -d ${DESTDIR}/${category}/${port} ]; then
	echo "patch:  $port"
	echo "cd ${DESTDIR}/${category}"
	echo "patch -p0 < ${SRCDIR}/${category}/${port}.diff"
	echo "find ./${port} -name "*.orig" -delete"
	# removing empty patches:
	echo "find ./${port} -size 0c -delete"
    else
        echo "there exists no port ${category}/${port} who can patched"
    fi
  done
done

echo "===> Merging done."
echo
printf "Now you should run portupgrade -r pkgconfig to update all of your GNOME 2\nports.\n"

--=-5RvbAOMeNd3YMfNCCap2
Content-Disposition: attachment; filename=marcusfreeze
Content-Type: text/x-sh; name=marcusfreeze; charset=ISO8859-1
Content-Transfer-Encoding: 7bit

#!/bin/sh

# $Id: marcusfreeze$

SRCDIR="/home/klammer/src/freeze"	# The path to the MarcusCom ports.
DESTDIR="/usr/ports"	# The path to the official ports collection.
VERBOSE="yes"		# If you want verbose output.
SUPFILE="/root/ports-supfile"

# You do not 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

echo "===> Deleting the the old ports directories"
for category in `ls -1 ${SRCDIR}`; do
  for difffile in `ls -1 ${SRCDIR}/${category}/*.diff`; do
    port=`basename ${difffile%.diff}`
    echo "deleting:  ${DESTDIR}/${category}/${port}"
      if [ -d ${DESTDIR}/${category}/${port} ]; then
	rm -R ${DESTDIR}/${category}/${port}"
      fi
  done
done

echo "===> run cvsup"
cvsup -g ${SUPFILE}

echo "===> Merging freeze-diffs to the ports directory"
echo "${SRCDIR} --> ${DESTDIR}"

for category in `ls -1 ${SRCDIR}`; do
  for difffile in `ls -1 ${SRCDIR}/${category}/*.diff`; do
    port=`basename ${difffile%.diff}`

    if [ -d ${DESTDIR}/${category}/${port} ]; then
	echo "patch:  $port"
	cd ${DESTDIR}/${category}
	patch -p0 < ${SRCDIR}/${category}/${port}.diff
	find ./${port} -name "*.orig" -delete
	# removing empty patches:
	find ./${port} -size 0c -delete
    else
        echo "there exists no port ${category}/${port} who can patched"
    fi
  done
done

echo "===> Merging done."
echo
printf "Now you should run portupgrade -r pkgconfig to update all of your GNOME 2\nports.\n"

--=-5RvbAOMeNd3YMfNCCap2--


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?1047413652.635.117.camel>