Date: Wed, 10 Jun 2009 22:46:40 +0200 From: Rene Ladan <r.c.ladan@gmail.com> To: Wesley Shields <wxs@FreeBSD.org> Cc: ports@freebsd.org, python@freebsd.org, miwi@freebsd.org Subject: Re: Python 2.6 update with portmaster Message-ID: <4A301BB0.5090500@gmail.com> In-Reply-To: <20090610162510.GE61383@atarininja.org> References: <20090610132647.GC40713@atarininja.org> <e890cae60906100744m56f4969cu6582a131423b2b32@mail.gmail.com> <20090610151212.GB61383@atarininja.org> <e890cae60906100826q9785a8epf202ab5fdcb12384@mail.gmail.com> <20090610154111.GC61383@atarininja.org> <e890cae60906100859k755a5087ib829ae3ce06368f1@mail.gmail.com> <20090610162510.GE61383@atarininja.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Wesley Shields schreef: > On Wed, Jun 10, 2009 at 05:59:42PM +0200, Rene Ladan wrote: >> 2009/6/10 Wesley Shields <wxs@freebsd.org>: >>> On Wed, Jun 10, 2009 at 05:26:40PM +0200, Rene Ladan wrote: >>>> 2009/6/10 Wesley Shields <wxs@freebsd.org>: >>>>> On Wed, Jun 10, 2009 at 04:44:41PM +0200, Rene Ladan wrote: >>>>>> 2009/6/10 Wesley Shields <wxs@freebsd.org>: >>>>>>> Here's a patch[1] that allows you to use portmaster when doing the python >>>>>>> upgrade. I intend to commit this tomorrow morning unless someone speaks >>>>>>> up. I'll also be adding the instructions to the UPDATING entry. >>>>>>> >>>>>>> Once applied you should be able to use: >>>>>>> >>>>>>> cd /usr/ports/lang/python && make upgrade-site-packages -DUSE_PORTMASTER >>>>>>> >>>>>>> It will be quite slow compared to using pkg_which (the normal method) so >>>>>>> be patient. I've used this patch to upgrade one lightly used machine and >>>>>>> I know at least one other person has survived an upgrade of a machine >>>>>>> with over 1000 ports installed. >>>>>>> >>>>>>> [1]: http://people.freebsd.org/~wxs/python26-portmaster.diff >>>>>>> >>>>>> I applied the patch, but there is something wrong: >>>>>> >>>>>>> # make upgrade-site-packages -DUSE_PORTMASTER >>>>>>> Syntax error: end of file unexpected (expecting "}") >>>>>>> *** Error code 2 >>>>>>> >>>>>>> Stop in /usr/ports/lang/python. >>>>> Sorry, updated the patch to address this. Please revert and try again. >>>>> >>>>> -- WXS >>>>> >>>> Still not :-( : >>>> >>>>> # patch <python26-portmaster.diff >>>>> Hmm... ?Looks like a unified diff to me... >>>>> The text leading up to this was: >>>>> -------------------------- >>>>> |Index: Makefile >>>>> |=================================================================== >>>>> |RCS file: /ncvs/ports/lang/python/Makefile,v >>>>> |retrieving revision 1.161 >>>>> |diff -u -r1.161 Makefile >>>>> |--- Makefile ? 31 Jul 2007 16:28:32 -0000 ? ? ?1.161 >>>>> |+++ Makefile ? 10 Jun 2009 15:15:23 -0000 >>>>> -------------------------- >>>>> Patching file Makefile using Plan A... >>>>> Hunk #1 succeeded at 24. >>>>> Hunk #2 succeeded at 46. >>>>> done >>>>> # make upgrade-site-packages -DUSE_PORTMASTER >>>>> >>>>> ===>>> /var/db/pkg/-f does not exist >>>>> ===>>> Aborting update >>>>> >>>>> *** Signal 15 >>>>> >>>>> Terminated >>>>> Stop in /usr/ports/lang/python. >>>>> # >>>> portmaster-2.7, python-2.6,2 and python26-2.6.2 are installed. >>>> This is on 7.2-RELEASE/i386 with portsnap tree as of "now". >>> The patch was only tested with PORTUPGRADE_ARGS defined. In the >>> case where it wasn't defined you would run into the issue you described. >>> I think I've fixed it now, so please revert and try again. Sorry for the >>> problems, but like I said earlier this is to get it more exposure. >>> >>> Please revert, fetch the patch again and apply. >>> >> It now also works fine without PORTUPGRADE_ARGS defined, i.e. just >> # ( cd /usr/ports/lang/python && make upgrade-site-packages -DUSE_PORTMASTER ) > > Thank you. I'll wait till tomorrow morning (about 24 hours from when I > started this thread) before I commit. If anyone has any more feedback, > positive or negative please let me know. > The latest patch also works fine on my 7.2-RELEASE/amd64 which has xorg-7.4 and xfce-4.6.1 installed. Regards, Rene -- http://www.rene-ladan.nl/ GPG fingerprint = E738 5471 D185 7013 0EE0 4FC8 3C1D 6F83 12E1 84F6 (subkeys.pgp.net)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A301BB0.5090500>