Date: Wed, 22 Oct 2003 01:37:29 +0900 From: Hye-Shik Chang <perky@i18n.org> To: Andy Fawcett <andy@athame.co.uk> Cc: ports@FreeBSD.org Subject: Re: lang/python fails to portupgrade Message-ID: <20031021163729.GA91839@i18n.org> In-Reply-To: <200310211931.31433.andy@athame.co.uk> References: <200310211931.31433.andy@athame.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 21, 2003 at 07:31:31PM +0300, Andy Fawcett wrote:
> Sorry about the mail rather than a PR, I seem to have broken my send-pr
> somehow. I'll fix that next...
>
>
> hex# portupgrade -fr python
> ---> Upgrading 'python-2.3_1' to 'python-2.3.2' (lang/python)
> ---> Building '/usr/ports/lang/python'
> ===> Cleaning for python-2.3.2
> ===> Extracting for python-2.3.2
> >> Checksum OK for python/Python-2.3.tgz.
> /usr/bin/sed -e '1s,^.*$,#!/usr/local/bin/python2.3,' /usr/ports/lang/
> python/work/Python-2.3/Tools/scripts/pydoc > /usr/ports/lang/python/work/
> pydoc2.3
> /usr/bin/sed -e '1s,^.*$,#!/usr/local/bin/python2.3,' /usr/ports/lang/
> python/work/Python-2.3/Tools/scripts/idle > /usr/ports/lang/python/work/
> idle2.3
> ===> Patching for python-2.3.2
> ===> Applying FreeBSD patches for python-2.3.2
> 1 out of 2 hunks failed--saving rejects to configure.rej
> >> Patch patch-configure failed to apply cleanly.
> >> Patch(es) patch-Modules::_sre.c applied cleanly.
> *** Error code 1
>
>
> I can't help wondering quite why it's extracting 2.3 instead of 2.3.2, nor
> why there's a whole bunch of distfiles listed in the distinfo file either.
>
> ports tree is up to date, BTW.
>
Aah. Can you try this patch? I guess that this problem is caused by
ports/Mk/bsd.python.mk rev 1.38
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/python/Makefile,v
retrieving revision 1.110
diff -u -u -r1.110 Makefile
--- Makefile 19 Oct 2003 09:17:44 -0000 1.110
+++ Makefile 21 Oct 2003 16:34:53 -0000
@@ -10,7 +10,7 @@
CATEGORIES= lang python ipv6
MASTER_SITES= ${MASTER_SITE_PYTHON}
MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR}
-DISTFILES= ${PYTHON_DISTFILE}
+DISTNAME= Python-${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT?= An interpreted object-oriented programming language
Regards,
Hye-Shik =)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031021163729.GA91839>