From owner-freebsd-python@FreeBSD.ORG Wed Jun 10 20:46:45 2009 Return-Path: Delivered-To: python@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FF67106564A; Wed, 10 Jun 2009 20:46:45 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from mail-ew0-f212.google.com (mail-ew0-f212.google.com [209.85.219.212]) by mx1.freebsd.org (Postfix) with ESMTP id 907888FC16; Wed, 10 Jun 2009 20:46:44 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: by mail-ew0-f212.google.com with SMTP id 8so1127109ewy.43 for ; Wed, 10 Jun 2009 13:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:content-type:content-transfer-encoding; bh=ttQuqdMAepSqjCtSOCr7f7rRBFCdPXsGUTX/TdMEScs=; b=efgDXql8IRY4yPDsh+WFqtgD5e0MHGnB0lmdZ4Tu/vziIcVUhqG25XjqyOlnEq1gI7 RRF+2b3A/alXUCRZ5G76qJrdARKjUAlZVUiF0aTarj8bMR+X1x6+R54irp6jM/iB77qQ 461wRGhn6Lgf9vJr6xgRm+ObSClDr96SW/sAA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=kWdvvP08hOBB1yQPIz6ghv3TRGOKVKsb9yThvS2JQg5p5WwyOF2AU7FgwOXy8fM9IS 2NzHuxSPiItST/I0ero69I2hMyzYX3mxi2thF8YC+qv6ymtJ+cr5AhOoj3ezEIKaUplA bjRRjRSsaCZM68uU49ZmaabGE6LJ/KNqvth2I= Received: by 10.210.128.5 with SMTP id a5mr7778467ebd.83.1244666804234; Wed, 10 Jun 2009 13:46:44 -0700 (PDT) Received: from self.rene-ladan.nl ([77.163.174.49]) by mx.google.com with ESMTPS id 28sm40519eye.56.2009.06.10.13.46.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Jun 2009 13:46:43 -0700 (PDT) Message-ID: <4A301BB0.5090500@gmail.com> Date: Wed, 10 Jun 2009 22:46:40 +0200 From: Rene Ladan User-Agent: Thunderbird 2.0.0.21 (X11/20090404) MIME-Version: 1.0 To: Wesley Shields References: <20090610132647.GC40713@atarininja.org> <20090610151212.GB61383@atarininja.org> <20090610154111.GC61383@atarininja.org> <20090610162510.GE61383@atarininja.org> In-Reply-To: <20090610162510.GE61383@atarininja.org> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@freebsd.org, python@freebsd.org, miwi@freebsd.org Subject: Re: Python 2.6 update with portmaster X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 20:46:46 -0000 Wesley Shields schreef: > On Wed, Jun 10, 2009 at 05:59:42PM +0200, Rene Ladan wrote: >> 2009/6/10 Wesley Shields : >>> On Wed, Jun 10, 2009 at 05:26:40PM +0200, Rene Ladan wrote: >>>> 2009/6/10 Wesley Shields : >>>>> On Wed, Jun 10, 2009 at 04:44:41PM +0200, Rene Ladan wrote: >>>>>> 2009/6/10 Wesley Shields : >>>>>>> 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 >>>> 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)