Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
Ruslan Mahmatkhanov wrote at 17:24 +0400 on Apr 11, 2012:
> m...@freebsd.org wrote on 11.04.2012 17:17:
> > Synopsis: Mk/bsd.python.mk: PYTHON_VERSION is ignored
> >
> > State-Changed-From-To: open->closed
> > State-Changed-By: miwi
> > State-Changed-When: Wed Apr 11 13:17:46 UTC 2012
> > State-Changed-Why:
> > user mistake, you have to set USE_PYTHON= 2.6.
> >
> > http://www.freebsd.org/cgi/query-pr.cgi?pr=159215
>
> Martin, I'm not sure about. There is a comment in bsd.python.mk that states:
>
> """
> Define PYTHON_VERSION to override the defaults that USE_PYTHON would
> give you.
> """
>
> In PR I tried to do just that, but it didn't working.
In the french/aster/Makefile, PYTHON_VERSION=2.6 should be
PYTHON_VERSION=python2.6 (or use USE_PYTHON=2.6 as Martin suggested).
But (#1) neither work because bsd.port.pre.mk defines PYTHON_PORTSDIR
before the new python version can be set by the ARCH == amd64 test.
But (#2) you can't put the ARCH .if test before bsd.port.pre.mk since
ARCH is not defined at that point.
So, you're stuck with an ARCH before USE_PYTHON and USE_PYTHON before
ARCH chicken and egg problem if you want to change the python version
based on ARCH.
The following ugly hack to french/aster/Makefile works around the issue.
It includes bsd.port.pre.mk twice, setting USE_PYTHON
based on ARCH in between.
There may be a better fix that could be made to bsd.python.mk
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/french/aster/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile12 Dec 2011 00:29:42 - 1.89
+++ Makefile11 Apr 2012 19:14:52 -
@@ -50,7 +50,6 @@ MANUAL_PACKAGE_BUILD= runaway python on
LICENSE= GPLv2
USE_BISON= build
-USE_PYTHON=yes
HAS_CONFIGURE= yes
REINPLACE_ARGS=-i ""
@@ -67,6 +66,11 @@ INTERACTIVE_SCRIPTS= check_compilers.py
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
.include
+.if ${ARCH} == "amd64"
+# python 2.7 causes process runaway
+USE_PYTHON=2.6
+.endif
+.include
.if ${ARCH} == "i386"
FLAGARCH= -DP_LINUX -DLINUX
@@ -76,10 +80,6 @@ FLAGARCH=-DLINUX64
FFLAGARCH= -fdefault-integer-8 -fdefault-real-8
.endif
-.if ${ARCH} == "amd64"
-# python 2.7 causes process runaway
-PYTHON_VERSION=2.6
-.endif
# Avoid renaming .f into .F
#F90FLAGS= -x f77-cpp-input ${FFLAGS}
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
John Hein wrote at 13:22 -0600 on Apr 11, 2012:
> Ruslan Mahmatkhanov wrote at 17:24 +0400 on Apr 11, 2012:
> > m...@freebsd.org wrote on 11.04.2012 17:17:
> > > Synopsis: Mk/bsd.python.mk: PYTHON_VERSION is ignored
> > >
> > > State-Changed-From-To: open->closed
> > > State-Changed-By: miwi
> > > State-Changed-When: Wed Apr 11 13:17:46 UTC 2012
> > > State-Changed-Why:
> > > user mistake, you have to set USE_PYTHON= 2.6.
> > >
> > > http://www.freebsd.org/cgi/query-pr.cgi?pr=159215
> >
> > Martin, I'm not sure about. There is a comment in bsd.python.mk that
> states:
> >
> > """
> > Define PYTHON_VERSION to override the defaults that USE_PYTHON would
> > give you.
> > """
> >
> > In PR I tried to do just that, but it didn't working.
>
> In the french/aster/Makefile, PYTHON_VERSION=2.6 should be
> PYTHON_VERSION=python2.6 (or use USE_PYTHON=2.6 as Martin suggested).
>
> But (#1) neither work because bsd.port.pre.mk defines PYTHON_PORTSDIR
> before the new python version can be set by the ARCH == amd64 test.
>
> But (#2) you can't put the ARCH .if test before bsd.port.pre.mk since
> ARCH is not defined at that point.
>
> So, you're stuck with an ARCH before USE_PYTHON and USE_PYTHON before
> ARCH chicken and egg problem if you want to change the python version
> based on ARCH.
>
> The following ugly hack to french/aster/Makefile works around the issue.
> It includes bsd.port.pre.mk twice, setting USE_PYTHON
> based on ARCH in between.
> There may be a better fix that could be made to bsd.python.mk
Better patch (forgot to set USE_PYTHON for the non amd64 case)...
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/french/aster/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile12 Dec 2011 00:29:42 - 1.89
+++ Makefile11 Apr 2012 19:27:34 -
@@ -50,7 +50,6 @@ MANUAL_PACKAGE_BUILD= runaway python on
LICENSE= GPLv2
USE_BISON= build
-USE_PYTHON=yes
HAS_CONFIGURE= yes
REINPLACE_ARGS=-i ""
@@ -67,6 +66,13 @@ INTERACTIVE_SCRIPTS= check_compilers.py
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
.include
+.if ${ARCH} == "amd64"
+# python 2.7 causes process runaway
+USE_PYTHON=2.6
+.else
+USE_PYTHON=yes
+.endif
+.include
.if ${ARCH} == "i386"
FLAGARCH= -DP_LINUX -DLINUX
@@ -76,10 +82,6 @@ FLAGARCH=-DLINUX64
FFLAGARCH= -fdefault-integer-8 -fdefault-real-8
.endif
-.if ${ARCH} == "amd64"
-# python 2.7 causes process runaway
-PYTHON_VERSION=2.6
-.endif
# Avoid renaming .f into .F
#F90FLAGS= -x f77-cpp-input ${FFLAGS}
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
The following reply was made to PR ports/159215; it has been noted by GNATS.
From: John Hein
To: Ruslan Mahmatkhanov
Cc: , , ,
Subject: Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
Date: Wed, 11 Apr 2012 13:22:17 -0600
Ruslan Mahmatkhanov wrote at 17:24 +0400 on Apr 11, 2012:
> m...@freebsd.org wrote on 11.04.2012 17:17:
> > Synopsis: Mk/bsd.python.mk: PYTHON_VERSION is ignored
> >
> > State-Changed-From-To: open->closed
> > State-Changed-By: miwi
> > State-Changed-When: Wed Apr 11 13:17:46 UTC 2012
> > State-Changed-Why:
> > user mistake, you have to set USE_PYTHON= 2.6.
> >
> > http://www.freebsd.org/cgi/query-pr.cgi?pr=159215
>
> Martin, I'm not sure about. There is a comment in bsd.python.mk that states:
>
> """
> Define PYTHON_VERSION to override the defaults that USE_PYTHON would
> give you.
> """
>
> In PR I tried to do just that, but it didn't working.
In the french/aster/Makefile, PYTHON_VERSION=2.6 should be
PYTHON_VERSION=python2.6 (or use USE_PYTHON=2.6 as Martin suggested).
But (#1) neither work because bsd.port.pre.mk defines PYTHON_PORTSDIR
before the new python version can be set by the ARCH == amd64 test.
But (#2) you can't put the ARCH .if test before bsd.port.pre.mk since
ARCH is not defined at that point.
So, you're stuck with an ARCH before USE_PYTHON and USE_PYTHON before
ARCH chicken and egg problem if you want to change the python version
based on ARCH.
The following ugly hack to french/aster/Makefile works around the issue.
It includes bsd.port.pre.mk twice, setting USE_PYTHON
based on ARCH in between.
There may be a better fix that could be made to bsd.python.mk
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/french/aster/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile 12 Dec 2011 00:29:42 - 1.89
+++ Makefile 11 Apr 2012 19:14:52 -
@@ -50,7 +50,6 @@ MANUAL_PACKAGE_BUILD=runaway python on
LICENSE= GPLv2
USE_BISON=build
-USE_PYTHON= yes
HAS_CONFIGURE=yes
REINPLACE_ARGS= -i ""
@@ -67,6 +66,11 @@ INTERACTIVE_SCRIPTS=check_compilers.py
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
.include
+.if ${ARCH} == "amd64"
+# python 2.7 causes process runaway
+USE_PYTHON= 2.6
+.endif
+.include
.if ${ARCH} == "i386"
FLAGARCH= -DP_LINUX -DLINUX
@@ -76,10 +80,6 @@ FLAGARCH= -DLINUX64
FFLAGARCH=-fdefault-integer-8 -fdefault-real-8
.endif
-.if ${ARCH} == "amd64"
-# python 2.7 causes process runaway
-PYTHON_VERSION= 2.6
-.endif
# Avoid renaming .f into .F
#F90FLAGS=-x f77-cpp-input ${FFLAGS}
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
The following reply was made to PR ports/159215; it has been noted by GNATS.
From: John Hein
To: Ruslan Mahmatkhanov
Cc: , ,
,
Subject: Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
Date: Wed, 11 Apr 2012 13:28:38 -0600
John Hein wrote at 13:22 -0600 on Apr 11, 2012:
> Ruslan Mahmatkhanov wrote at 17:24 +0400 on Apr 11, 2012:
> > m...@freebsd.org wrote on 11.04.2012 17:17:
> > > Synopsis: Mk/bsd.python.mk: PYTHON_VERSION is ignored
> > >
> > > State-Changed-From-To: open->closed
> > > State-Changed-By: miwi
> > > State-Changed-When: Wed Apr 11 13:17:46 UTC 2012
> > > State-Changed-Why:
> > > user mistake, you have to set USE_PYTHON= 2.6.
> > >
> > > http://www.freebsd.org/cgi/query-pr.cgi?pr=159215
> >
> > Martin, I'm not sure about. There is a comment in bsd.python.mk that
states:
> >
> > """
> > Define PYTHON_VERSION to override the defaults that USE_PYTHON would
> > give you.
> > """
> >
> > In PR I tried to do just that, but it didn't working.
>
> In the french/aster/Makefile, PYTHON_VERSION=2.6 should be
> PYTHON_VERSION=python2.6 (or use USE_PYTHON=2.6 as Martin suggested).
>
> But (#1) neither work because bsd.port.pre.mk defines PYTHON_PORTSDIR
> before the new python version can be set by the ARCH == amd64 test.
>
> But (#2) you can't put the ARCH .if test before bsd.port.pre.mk since
> ARCH is not defined at that point.
>
> So, you're stuck with an ARCH before USE_PYTHON and USE_PYTHON before
> ARCH chicken and egg problem if you want to change the python version
> based on ARCH.
>
> The following ugly hack to french/aster/Makefile works around the issue.
> It includes bsd.port.pre.mk twice, setting USE_PYTHON
> based on ARCH in between.
> There may be a better fix that could be made to bsd.python.mk
Better patch (forgot to set USE_PYTHON for the non amd64 case)...
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/french/aster/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile 12 Dec 2011 00:29:42 - 1.89
+++ Makefile 11 Apr 2012 19:27:34 -
@@ -50,7 +50,6 @@ MANUAL_PACKAGE_BUILD=runaway python on
LICENSE= GPLv2
USE_BISON=build
-USE_PYTHON= yes
HAS_CONFIGURE=yes
REINPLACE_ARGS= -i ""
@@ -67,6 +66,13 @@ INTERACTIVE_SCRIPTS=check_compilers.py
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
.include
+.if ${ARCH} == "amd64"
+# python 2.7 causes process runaway
+USE_PYTHON= 2.6
+.else
+USE_PYTHON= yes
+.endif
+.include
.if ${ARCH} == "i386"
FLAGARCH= -DP_LINUX -DLINUX
@@ -76,10 +82,6 @@ FLAGARCH= -DLINUX64
FFLAGARCH=-fdefault-integer-8 -fdefault-real-8
.endif
-.if ${ARCH} == "amd64"
-# python 2.7 causes process runaway
-PYTHON_VERSION= 2.6
-.endif
# Avoid renaming .f into .F
#F90FLAGS=-x f77-cpp-input ${FFLAGS}
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
Mel Flynn wrote at 21:47 +0200 on Apr 11, 2012: > On 4/11/2012 21:22, John Hein wrote: > > > But (#1) neither work because bsd.port.pre.mk defines PYTHON_PORTSDIR > > before the new python version can be set by the ARCH == amd64 test. > > > > But (#2) you can't put the ARCH .if test before bsd.port.pre.mk since > > ARCH is not defined at that point. > > Just a thought: > You can simplify the hack by including bsd.port.options.mk instead of > the first bsd.port.pre.mk. ARCH will be defined while bsd.python.mk > isn't included yet. Indeed. Although it's a bit counterintuitive to include bsd.port.options.mk when there are no OPTIONS. However, it's perhaps safer than including pre.mk twice and hoping no one changes anything above the first that leaves USE_PYTHON defined. Whichever of those hacks is used, there should be a comment about what's going on and why. ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored
The following reply was made to PR ports/159215; it has been noted by GNATS. From: John Hein To: Mel Flynn Cc: Ruslan Mahmatkhanov , , , , Subject: Re: ports/159215: Mk/bsd.python.mk: PYTHON_VERSION is ignored Date: Wed, 11 Apr 2012 13:55:25 -0600 Mel Flynn wrote at 21:47 +0200 on Apr 11, 2012: > On 4/11/2012 21:22, John Hein wrote: > > > But (#1) neither work because bsd.port.pre.mk defines PYTHON_PORTSDIR > > before the new python version can be set by the ARCH == amd64 test. > > > > But (#2) you can't put the ARCH .if test before bsd.port.pre.mk since > > ARCH is not defined at that point. > > Just a thought: > You can simplify the hack by including bsd.port.options.mk instead of > the first bsd.port.pre.mk. ARCH will be defined while bsd.python.mk > isn't included yet. Indeed. Although it's a bit counterintuitive to include bsd.port.options.mk when there are no OPTIONS. However, it's perhaps safer than including pre.mk twice and hoping no one changes anything above the first that leaves USE_PYTHON defined. Whichever of those hacks is used, there should be a comment about what's going on and why. ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: /usr/local/share/python2.7/Tools permissions
Dmitry Sivachenko wrote at 18:46 +0400 on May 4, 2012: > PS: the same permission problem with /usr/local/share/examples/python2.7/ > content. > > On 04.05.2012 18:42, Dmitry Sivachenko wrote: > > Hello! > > > > /usr/local/share/python2.7/Tools directory and all its content has no > > 'other' > > permissions: > > > > # cd /usr/local/share/python2.7/Tools/ > > # ls -la > > total 46/ > > drwxr-x--- 22 root wheel 512 10 апр 03:07 . > > drwxr-xr-x 3 root wheel 512 3 май 08:42 .. > > -rw-r--r-- 1 root wheel 1756 10 апр 03:07 README > > drwxr-x--- 2 root wheel 512 10 апр 03:07 audiopy > > drwxr-x--- 3 root wheel 512 10 апр 03:07 bgen > > drwxr-x--- 2 root wheel 512 10 апр 03:07 buildbot > > drwxr-x--- 2 root wheel 512 10 апр 03:07 ccbench > > drwxr-x--- 2 root wheel 512 10 апр 03:07 compiler > > drwxr-x--- 2 root wheel 512 10 апр 03:07 faqwiz > > drwxr-x--- 3 root wheel 512 10 апр 03:07 framer > > drwxr-x--- 2 root wheel 512 10 апр 03:07 freeze > > drwxr-x--- 2 root wheel 512 10 апр 03:07 gdb > > drwxr-x--- 2 root wheel 512 10 апр 03:07 i18n > > drwxr-x--- 2 root wheel 512 10 апр 03:07 iobench > > <...> > > > > I have umask=022. > > > > With python32 port I have no such a problem: > > > > # pwd > > /usr/local/share/python3.2/Tools > > # ls -la > > total 36 > > drwxr-xr-x 17 root wheel 512 9 июл 2011 . > > drwxr-xr-x 3 root wheel 512 27 авг 2011 .. > > -rw-r--r-- 1 root wheel 1639 9 июл 2011 README > > drwxr-xr-x 2 root wheel 512 9 июл 2011 buildbot > > drwxr-xr-x 2 root wheel 512 9 июл 2011 ccbench > > drwxr-xr-x 2 root wheel 512 9 июл 2011 demo > > drwxr-xr-x 2 root wheel 512 9 июл 2011 freeze > > drwxr-xr-x 2 root wheel 512 9 июл 2011 gdb > > drwxr-xr-x 2 root wheel 512 9 июл 2011 i18n > > drwxr-xr-x 2 root wheel 512 9 июл 2011 iobench > > drwxr-xr-x 2 root wheel 512 9 июл 2011 msi > > drwxr-xr-x 2 root wheel 512 9 июл 2011 parser > > drwxr-xr-x 3 root wheel 512 9 июл 2011 pybench > > drwxr-xr-x 3 root wheel 512 9 июл 2011 pynche > > drwxr-xr-x 2 root wheel 1536 9 июл 2011 scripts > > drwxr-xr-x 4 root wheel 512 9 июл 2011 test2to3 > > drwxr-xr-x 3 root wheel 512 9 июл 2011 unicode > > drwxr-xr-x 2 root wheel 512 9 июл 2011 unittestgui > > > > > > Is there any reason for such permissions? > > > > Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=152224 ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: Python conflicting with other python when installed from packages
Ruslan Mahmatkhanov wrote at 16:14 +0400 on Jun 5, 2012: > Baptiste Daroussin wrote on 05.06.2012 16:07: > > Hi, > > > > With pkgng build on pointyhat I discovered that all the python packages > > when > > built on pointyhat, tinderbox or even poudriere all conflicts which each > > other > > meaning you can't install multiple python version in parallel without > > overwritting files with old package system and pkgng just forbid you to > > install > > the second package to avoid overwritting the file. > > > > The thing is that they are conflicting only for the bin/2to3 file. It > > would be > > nice if this file could be for example prefixed with the release of python > > like: > > > > bin/py27-2to3 or something like that. I'm aware that when just installing > > from > > ports only the first version of python installed got it, but if you are > > thinking > > in package only world it can't works that way. > > > > regards, > > Bapt > > Packages that using 2to3 to convert their code on install to be python3 > compatible looking exactly for `2to3' executable. So such a modification > would require modifying all the setup.py's according the python version > user has installed as default. It's just a though. I didn't see how to > resolve this correctly. One way: pull out 2to3 to its own separate port and have those ports that need it specify the dependency. And, no, I don't have patches. ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: Python conflicting with other python when installed from packages
Ruslan Mahmatkhanov wrote at 21:42 +0400 on Jun 5, 2012:
> John Hein wrote on 05.06.2012 21:09:
> > Ruslan Mahmatkhanov wrote at 16:14 +0400 on Jun 5, 2012:
> > > Packages that using 2to3 to convert their code on install to be
> > python3
> > > compatible looking exactly for `2to3' executable. So such a
> > modification
> > > would require modifying all the setup.py's according the python
> > version
> > > user has installed as default. It's just a though. I didn't see how to
> > > resolve this correctly.
> >
> > One way: pull out 2to3 to its own separate port and have those
> > ports that need it specify the dependency. And, no, I don't
> > have patches.
>
> Well, then we'll get separate 2to3 ports that is conflicting :). I'm not
> sure that 2to3 is the same in all python distributions.
It was my understanding that you should be able to use
lib/pythonXXX/lib2to3 from any recent python distribution (2.x or 3.x)
interchangeably. A quick glance at a diff between lib2to3 on
2.7 and 3.2 seems to confirm that. Corrections welcome.
I doubt the few ports that explicitly rely on 2to3 (sorry, I have not
fully audited the ports to figure out which ports do, but I expect
it's a small number, possibly 0 [1]) care whether XXX is 2.7 or 3.2.
If my assertion is correct, the proposed 2to3 port would just contain
one file:
% cat /usr/local/bin/2to3
#!/usr/bin/env python
import sys
from lib2to3.main import main
sys.exit(main("lib2to3.fixes"))
(where this is the only difference between old and new:
--- 2to3.orig 2012-06-05 12:44:17.0 -0600
+++ 2to32012-06-05 12:44:30.0 -0600
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python2.7
+#!/usr/bin/env python
import sys
from lib2to3.main import main
And the 2to3 port would have a (run) dependency on python (any
installed version will do).
[1] py-sqlalchemy is one, sort of. It has a script that imports lib2to3
directly instead of invoking 2to3.
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[PATCH] devel/mercurial: update to 2.2.3
>Submitter-Id: current-users >Originator: John Hein >Organization: >Confidential: no >Synopsis: [PATCH] devel/mercurial: update to 2.2.3 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: >Environment: >Description: - Update to 2.2.3 This has been lightly run tested locally for a few days now. changes... http://mercurial.selenic.com/wiki/WhatsNew/#Mercurial_2.2.3_.282012-07-01.29 build log... https://redports.org/~jhein/20120703222845-52366-33226/mercurial-2.2.3.log Port maintainer (pyt...@freebsd.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: CVS) >How-To-Repeat: >Fix: --- mercurial-2.2.3.patch begins here --- Index: Makefile === RCS file: /base/FreeBSD-CVS/ports/devel/mercurial/Makefile,v retrieving revision 1.72 diff -u -p -u -r1.72 Makefile --- Makefile3 Jun 2012 19:38:59 - 1.72 +++ Makefile3 Jul 2012 21:20:42 - @@ -6,7 +6,7 @@ # PORTNAME= mercurial -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES=devel python MASTER_SITES= http://mercurial.selenic.com/release/ Index: distinfo === RCS file: /base/FreeBSD-CVS/ports/devel/mercurial/distinfo,v retrieving revision 1.47 diff -u -p -u -r1.47 distinfo --- distinfo3 Jun 2012 19:38:59 - 1.47 +++ distinfo3 Jul 2012 21:12:52 - @@ -1,2 +1,2 @@ -SHA256 (mercurial-2.2.2.tar.gz) = 3489110ec11fefbd2cbdefb8d715d0a869cef3dd729aaf4d5141108f8be1600a -SIZE (mercurial-2.2.2.tar.gz) = 3430037 +SHA256 (mercurial-2.2.3.tar.gz) = 7c61e38585ba252b31f75df6006bdcf1ff11030321f9fc628f0e1c61929d677b +SIZE (mercurial-2.2.3.tar.gz) = 3441501 --- mercurial-2.2.3.patch ends here --- ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[PATCH] devel/mercurial: update to 2.3
>Submitter-Id: current-users >Originator: John Hein >Organization: >Confidential: no >Synopsis: [PATCH] devel/mercurial: update to 2.3 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: >Environment: >Description: Update mercurial to 2.3 Changes... http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.3_.282012-08-01.29 Tested lightly on working repos. Port maintainer (pyt...@freebsd.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: CVS) >How-To-Repeat: >Fix: --- mercurial-2.3.patch begins here --- Index: Makefile === RCS file: /base/FreeBSD-CVS/ports/devel/mercurial/Makefile,v retrieving revision 1.73 diff -u -p -u -r1.73 Makefile --- Makefile10 Jul 2012 07:05:59 - 1.73 +++ Makefile8 Aug 2012 17:17:33 - @@ -6,7 +6,7 @@ # PORTNAME= mercurial -PORTVERSION= 2.2.3 +PORTVERSION= 2.3 CATEGORIES=devel python MASTER_SITES= http://mercurial.selenic.com/release/ Index: distinfo === RCS file: /base/FreeBSD-CVS/ports/devel/mercurial/distinfo,v retrieving revision 1.49 diff -u -p -u -r1.49 distinfo --- distinfo10 Jul 2012 14:13:58 - 1.49 +++ distinfo8 Aug 2012 17:18:15 - @@ -1,2 +1,2 @@ -SHA256 (mercurial-2.2.3.tar.gz) = 7c61e38585ba252b31f75df6006bdcf1ff11030321f9fc628f0e1c61929d677b -SIZE (mercurial-2.2.3.tar.gz) = 3441501 +SHA256 (mercurial-2.3.tar.gz) = 456cb8a9fb15606a04d81589a3459d258149170008ca64c62e5a6cbaf5f0fe5f +SIZE (mercurial-2.3.tar.gz) = 3549002 Index: pkg-plist === RCS file: /base/FreeBSD-CVS/ports/devel/mercurial/pkg-plist,v retrieving revision 1.46 diff -u -p -u -r1.46 pkg-plist --- pkg-plist 3 Jun 2012 19:38:59 - 1.46 +++ pkg-plist 8 Aug 2012 20:23:05 - @@ -87,6 +87,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/hgext/hgk.py %%PYTHON_SITELIBDIR%%/hgext/hgk.pyc %%PYTHON_SITELIBDIR%%/hgext/hgk.pyo +%%PYTHON_SITELIBDIR%%/hgext/histedit.py +%%PYTHON_SITELIBDIR%%/hgext/histedit.pyc +%%PYTHON_SITELIBDIR%%/hgext/histedit.pyo %%PYTHON_SITELIBDIR%%/hgext/highlight/__init__.py %%PYTHON_SITELIBDIR%%/hgext/highlight/__init__.pyc %%PYTHON_SITELIBDIR%%/hgext/highlight/__init__.pyo @@ -336,15 +339,18 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/httpclient/__init__.py %%PYTHON_SITELIBDIR%%/mercurial/httpclient/__init__.pyc %%PYTHON_SITELIBDIR%%/mercurial/httpclient/__init__.pyo +%%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.py +%%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.pyc +%%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.pyo %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.py %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyc %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyo %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.py %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyc %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyo -%%PYTHON_SITELIBDIR%%/mercurial/httprepo.py -%%PYTHON_SITELIBDIR%%/mercurial/httprepo.pyc -%%PYTHON_SITELIBDIR%%/mercurial/httprepo.pyo +%%PYTHON_SITELIBDIR%%/mercurial/httppeer.py +%%PYTHON_SITELIBDIR%%/mercurial/httppeer.pyc +%%PYTHON_SITELIBDIR%%/mercurial/httppeer.pyo %%PYTHON_SITELIBDIR%%/mercurial/i18n.py %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyc %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyo @@ -354,12 +360,6 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/keepalive.py %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo -%%PYTHON_SITELIBDIR%%/mercurial/phases.py -%%PYTHON_SITELIBDIR%%/mercurial/phases.pyc -%%PYTHON_SITELIBDIR%%/mercurial/phases.pyo -%%PYTHON_SITELIBDIR%%/mercurial/pvec.py -%%PYTHON_SITELIBDIR%%/mercurial/pvec.pyc -%%PYTHON_SITELIBDIR%%/mercurial/pvec.pyo %%NLSPYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES/hg.mo %%NLSPYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES/hg.mo %%NLSPYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES/hg.mo @@ -406,6 +406,9 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/node.py %%PYTHON_SITELIBDIR%%/mercurial/node.pyc %%PYTHON_SITELIBDIR%%/mercurial/node.pyo +%%PYTHON_SITELIBDIR%%/mercurial/obsolete.py +%%PYTHON_SITELIBDIR%%/mercurial/obsolete.pyc +%%PYTHON_SITELIBDIR%%/mercurial/obsolete.pyo %%PYTHON_SITELIBDIR%%/mercurial/osutil.so %%PYTHON_SITELIBDIR%%/mercurial/parser.py %%PYTHON_SITELIBDIR%%/mercurial/parser.pyc @@ -414,21 +417,27 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/patch.py %%PYTHON_SITELIBDIR%%/mercurial/patch.pyc %%PYTHON_SITELIBDIR%%/mercurial/patch.pyo +%%PYTHON_SITELIBDIR%%/mercurial/peer.py +%%PYTHON_SITELIBDIR%%/mercurial/peer.pyc +%%PYTHON_SITELIBDIR%%/mercurial/peer.pyo +%%PYTHON_SITELIBDIR%%/mercurial/phases.py +%%PYTHON_SITELIBDIR%%/mercurial/phases.pyc +%%PYTHON_SITELIBDIR%%/mercurial/phase
[patch] update devel/mercurial to 2.5.1
>Submitter-Id: current-users >Originator: John Hein >Organization: >Confidential: no >Synopsis: [patch] update devel/mercurial to 2.5.1 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: >Environment: >Description: 2.5.1 is a bug fix release for 20130201 mercurial-2.5 (which was not committed to freebsd port) http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.5.1_.282013-02-08.29 plist changes from 2.4.2 are the same as for mercurial-2.5 >How-To-Repeat: >Fix: Index: distinfo === --- distinfo(revision 312103) +++ distinfo(working copy) @@ -1,2 +1,2 @@ -SHA256 (mercurial-2.4.2.tar.gz) = cc21083d7eab4caa8159b941e36c7229acbb6d41a26a7bed21a771b3f63dedf3 -SIZE (mercurial-2.4.2.tar.gz) = 3613392 +SHA256 (mercurial-2.5.1.tar.gz) = 96688c49ee6cbf2809d0925f1ee797a9211f4ed735233d789cabfabaac221859 +SIZE (mercurial-2.5.1.tar.gz) = 3671108 Index: pkg-plist === --- pkg-plist (revision 312103) +++ pkg-plist (working copy) @@ -200,6 +200,9 @@ %%PYTHON_SITELIBDIR%%/mercurial/bookmarks.py %%PYTHON_SITELIBDIR%%/mercurial/bookmarks.pyc %%PYTHON_SITELIBDIR%%/mercurial/bookmarks.pyo +%%PYTHON_SITELIBDIR%%/mercurial/branchmap.py +%%PYTHON_SITELIBDIR%%/mercurial/branchmap.pyc +%%PYTHON_SITELIBDIR%%/mercurial/branchmap.pyo %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.py %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.pyc %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.pyo @@ -438,6 +441,9 @@ %%PYTHON_SITELIBDIR%%/mercurial/repair.py %%PYTHON_SITELIBDIR%%/mercurial/repair.pyc %%PYTHON_SITELIBDIR%%/mercurial/repair.pyo +%%PYTHON_SITELIBDIR%%/mercurial/repoview.py +%%PYTHON_SITELIBDIR%%/mercurial/repoview.pyc +%%PYTHON_SITELIBDIR%%/mercurial/repoview.pyo %%PYTHON_SITELIBDIR%%/mercurial/revlog.py %%PYTHON_SITELIBDIR%%/mercurial/revlog.pyc %%PYTHON_SITELIBDIR%%/mercurial/revlog.pyo @@ -491,6 +497,8 @@ %%PYTHON_SITELIBDIR%%/mercurial/templater.pyo %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/bookmarkentry.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/bookmarks.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/atom/branchentry.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/atom/branches.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/changelog.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/changelogentry.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/error.tmpl @@ -591,6 +599,8 @@ %%PYTHON_SITELIBDIR%%/mercurial/templates/raw/notfound.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/bookmarkentry.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/bookmarks.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/branchentry.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/branches.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/changelog.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/changelogentry.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/error.tmpl @@ -625,6 +635,7 @@ %%PYTHON_SITELIBDIR%%/mercurial/templates/static/coal-file.png %%PYTHON_SITELIBDIR%%/mercurial/templates/static/coal-folder.png %%PYTHON_SITELIBDIR%%/mercurial/templates/static/excanvas.js +%%PYTHON_SITELIBDIR%%/mercurial/templates/static/feed-icon-14x14.png %%PYTHON_SITELIBDIR%%/mercurial/templates/static/hgicon.png %%PYTHON_SITELIBDIR%%/mercurial/templates/static/hglogo.png %%PYTHON_SITELIBDIR%%/mercurial/templates/static/mercurial.js Index: Makefile === --- Makefile(revision 312103) +++ Makefile(working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mercurial -PORTVERSION= 2.4.2 +PORTVERSION= 2.5.1 CATEGORIES=devel python MASTER_SITES= http://mercurial.selenic.com/release/ ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: PYDISTUTILS_AUTOPLIST, stage, man pages
Marcus von Appen wrote at 09:39 +0200 on Oct 18, 2013:
> Andriy Gapon :
>
> > on 18/10/2013 09:44 Marcus von Appen said the following:
> >> Can you give the following change to Mk/bsd.python.mk a try:
> >>
> >> Index: Mk/bsd.python.mk
> >> ===
> >> --- Mk/bsd.python.mk (revision 330721)
> >> +++ Mk/bsd.python.mk (working copy)
> >> @@ -528,7 +528,9 @@
> >> ${SED} '/^\.$$/d' > ${WRKDIR}/.localmtree
> >> @${ECHO_CMD} "${_RELSITELIBDIR}" >> ${WRKDIR}/.localmtree
> >> @${ECHO_CMD} "${_RELLIBDIR}" >> ${WRKDIR}/.localmtree
> >> - @${SED} 's|^${PREFIX}/||' ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
> >> + @${SED} -e 's|^${PREFIX}/||' \
> >> + -e 's|^\(man/man[0-9]\)/\(.*.[0-9]\)|\1/\2${MANEXT}|' \
> >> + ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
> >> @${SED} -e 's|^${PREFIX}/\(.*\)/\(.*\)|\1|' ${_PYTHONPKGLIST} | \
> >> ${AWK} '{ num = split($$0, a, "/"); res=""; \
> >> for(i = 1; i <= num; ++i) { \
> >>
> >> It adds the .gz to every man/manX/*.X, if it is defined (depending on
> >> the NO_MANCOMPRESS setting).
> >
> > Woo-hoo, thanks a lot! The patch worked perfectly for me.
> > From pkg info -l py27-obnam-1.5:
> > /usr/local/man/man1/obnam-benchmark.1.gz
> > /usr/local/man/man1/obnam-viewprof.1.gz
> > /usr/local/man/man1/obnam.1.gz
>
> Excellent! I'll commit it later on.
Maybe you should escape the '.' before the [0-9] (like below).
Also if ${_PYTHONPKGLIST} already has entries with, then the patch
above will append another ${MANEXT}. Maybe adding '$' (also below)
will be better.
Is it worth trying to handle man{l,n}? They are defined in
BSD.local.dist, but I don't know of any ports that use them anymore?
Index: Mk/bsd.python.mk
===
--- Mk/bsd.python.mk(revision 330721)
+++ Mk/bsd.python.mk(working copy)
@@ -528,7 +528,9 @@
${SED} '/^\.$$/d' > ${WRKDIR}/.localmtree
@${ECHO_CMD} "${_RELSITELIBDIR}" >> ${WRKDIR}/.localmtree
@${ECHO_CMD} "${_RELLIBDIR}" >> ${WRKDIR}/.localmtree
- @${SED} 's|^${PREFIX}/||' ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
+ @${SED} -e 's|^${PREFIX}/||' \
+ -e 's|^\(man/man[0-9]\)/\(.*\.[0-9]\)$|\1/\2${MANEXT}|' \
+ ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
@${SED} -e 's|^${PREFIX}/\(.*\)/\(.*\)|\1|' ${_PYTHONPKGLIST} | \
${AWK} '{ num = split($$0, a, "/"); res=""; \
for(i = 1; i <= num; ++i) { \
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/184339: lang/python27 does not allow unsetting NLS (or other options)
It's something of a complicated interaction. But the reason you see a difference in lang/python27 vs. say, lang/gcc boils down to having OPTIONS_FILE_SET+=NLS in the saved options file _and_ NLS in OPTIONS_DEFINE. If so, bsd.options.mk overrides the WITHOUT_NLS setting. This could be considered a bug, but maybe it's just somewhat unexpected. koobs' comment is correct but slightly incomplete - WITHOUT_NLS loses to the options file even if set in the port's Makefile or make.conf, not just the command line. And it's not clear that the deprecation (which is not clearly documented that I could find - but I could have missed where it is spelled out) is meant to apply to settings in Makefile / make.conf. I could see this being an issue for a slave port that explicitly sets WITHOUT_XXX to override a master port option setting. Probably the right thing in that case is to use a mechanism to exclude XXX from the master's OPTIONS list when building the slave port. Anyway, it's not obvious to me that the options file should override WITH_*/WITHOUT_* settings or vice versa. It's not apparent that a setting in the options file should override make.conf. Maybe the option file setting should have a choice to "obey any global setting first" for a particular option in addition to just allowing it to be set or unset. Having WITHOUT_* work in some cases but not others consistently seems like a potential source of confusion if the rules are not spelled out clearly. As far as python27, I'm not sure why NLS is in the OPTIONS_DEFINE list instead of just relying on the fact that NLS is a global option. As far as I understand it, NLS could be removed from OPTIONS_DEFINE for python27 (& other pythonXY ports). It has a slightly different NLS_DESC than the default option, but I'm not sure that nuanced distinction is important in this case. Unless there's a good reason I'm missing to have NLS in OPTIONS_DEFINE, I'd vote on removing it from OPTIONS_DEFINE in python* (and EXAMPLES and IPV6, too, I suppose). ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/184339: lang/python27 does not allow unsetting NLS (or other options)
The following reply was made to PR ports/184339; it has been noted by GNATS. From: John Hein To: bug-follo...@freebsd.org Cc: , , Subject: Re: ports/184339: lang/python27 does not allow unsetting NLS (or other options) Date: Thu, 5 Dec 2013 13:04:30 -0700 It's something of a complicated interaction. But the reason you see a difference in lang/python27 vs. say, lang/gcc boils down to having OPTIONS_FILE_SET+=NLS in the saved options file _and_ NLS in OPTIONS_DEFINE. If so, bsd.options.mk overrides the WITHOUT_NLS setting. This could be considered a bug, but maybe it's just somewhat unexpected. koobs' comment is correct but slightly incomplete - WITHOUT_NLS loses to the options file even if set in the port's Makefile or make.conf, not just the command line. And it's not clear that the deprecation (which is not clearly documented that I could find - but I could have missed where it is spelled out) is meant to apply to settings in Makefile / make.conf. I could see this being an issue for a slave port that explicitly sets WITHOUT_XXX to override a master port option setting. Probably the right thing in that case is to use a mechanism to exclude XXX from the master's OPTIONS list when building the slave port. Anyway, it's not obvious to me that the options file should override WITH_*/WITHOUT_* settings or vice versa. It's not apparent that a setting in the options file should override make.conf. Maybe the option file setting should have a choice to "obey any global setting first" for a particular option in addition to just allowing it to be set or unset. Having WITHOUT_* work in some cases but not others consistently seems like a potential source of confusion if the rules are not spelled out clearly. As far as python27, I'm not sure why NLS is in the OPTIONS_DEFINE list instead of just relying on the fact that NLS is a global option. As far as I understand it, NLS could be removed from OPTIONS_DEFINE for python27 (& other pythonXY ports). It has a slightly different NLS_DESC than the default option, but I'm not sure that nuanced distinction is important in this case. Unless there's a good reason I'm missing to have NLS in OPTIONS_DEFINE, I'd vote on removing it from OPTIONS_DEFINE in python* (and EXAMPLES and IPV6, too, I suppose). ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[PATCH] devel/py27-dateutil: fix non-root build, other updates
>Submitter-Id: current-users
>Originator: John Hein
>Organization:
>Confidential: no
>Synopsis: [PATCH] devel/py27-dateutil: fix non-root build, other updates
>Severity: non-critical
>Priority: low
>Category: ports
>Class: sw-bug
>Release:
>Environment:
System:
>Description:
The main motivation for this patch is to fix the build for the
non-root user. The chmod in post-patch was removing write permission
from files that the build is trying to write to. Okay if you're root
on a local filesystem, but it fails if you are a regular user (try
just 'make' as a regular user) because setup.py tries to write to
files in the python_dateutil.egg-info (which are now read-only thanks
to the chmod 444 in post-patch).
The fix is to change ${SHAREMODE} (0444) to a+r for the chmod.
While I was here, I:
- added support for staging
- moved away from the deprecated easy_install (changes plist,
thus bumped PORTREVISION as well)
- replaced the deprecated BSD license with BSD3CLAUSE
I chose to still use the static pkg-plist rather than
use PYDISTUTILS_AUTOPLIST.
p.s. bsd.python.mk could probably add PYDISTUTILS_EGGINFO to PLIST_SUB.
Port maintainer (ni...@freebsd.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
As a regular user:
cd /usr/ports/devel/py-dateutil
make
Observe:
.
.
running egg_info
writing requirements to python_dateutil.egg-info/requires.txt
error: python_dateutil.egg-info/requires.txt: Permission denied
>Fix:
--- py27-dateutil-2.1_3.patch begins here ---
Index: Makefile
===
--- Makefile(revision 340890)
+++ Makefile(working copy)
@@ -3,7 +3,7 @@
PORTNAME= dateutil
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES=devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,19 +12,19 @@
MAINTAINER=ni...@freebsd.org
COMMENT= Provides powerful extensions to the standard datetime module
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
RUN_DEPENDS+= ${BUILD_DEPENDS}
USE_PYTHON=yes
-USE_PYDISTUTILS= easy_install
+USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= python-dateutil
+PLIST_SUB+=PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
# Fix incorrect permissions
-NO_STAGE= yes
post-patch:
- @${FIND} ${WRKSRC} -type f -exec ${CHMOD} ${SHAREMODE} {} ";"
+ @${FIND} ${WRKSRC} -type f -exec ${CHMOD} a+r {} ";"
@${REINPLACE_CMD} -e 's|import winreg|from six.moves import winreg|'
${WRKSRC}/dateutil/tzwin.py
regression-test: build
Index: pkg-plist
===
--- pkg-plist (revision 340890)
+++ pkg-plist (working copy)
@@ -1,35 +1,34 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/easter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/easter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/easter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/relativedelta.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/relativedelta.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/relativedelta.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/rrule.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/rrule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/rrule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tz.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tz.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tz.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tzwin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tzwin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tzwin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo/__init__.pyo
Re: ports/186088: [PATCH] devel/py27-dateutil: fix non-root build, other updates
Updated patch to remove egg-info stuff from pkg-plist as it is
automatically added when using USE_PYDISTUTILS=yes.
Index: Makefile
===
--- Makefile(revision 340890)
+++ Makefile(working copy)
@@ -3,7 +3,7 @@
PORTNAME= dateutil
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES=devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,19 +12,18 @@
MAINTAINER=ni...@freebsd.org
COMMENT= Provides powerful extensions to the standard datetime module
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
RUN_DEPENDS+= ${BUILD_DEPENDS}
USE_PYTHON=yes
-USE_PYDISTUTILS= easy_install
+USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= python-dateutil
# Fix incorrect permissions
-NO_STAGE= yes
post-patch:
- @${FIND} ${WRKSRC} -type f -exec ${CHMOD} ${SHAREMODE} {} ";"
+ @${FIND} ${WRKSRC} -type f -exec ${CHMOD} a+r {} ";"
@${REINPLACE_CMD} -e 's|import winreg|from six.moves import winreg|'
${WRKSRC}/dateutil/tzwin.py
regression-test: build
Index: pkg-plist
===
--- pkg-plist (revision 340890)
+++ pkg-plist (working copy)
@@ -1,35 +1,27 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/easter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/easter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/easter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/relativedelta.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/relativedelta.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/relativedelta.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/rrule.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/rrule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/rrule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tz.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tz.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tz.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tzwin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tzwin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/tzwin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo/zoneinfo--latest.tar.gz
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil/zoneinfo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dateutil
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PYTHON_SITELIBDIR%%/dateutil/__init__.py
+%%PYTHON_SITELIBDIR%%/dateutil/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/easter.py
+%%PYTHON_SITELIBDIR%%/dateutil/easter.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/easter.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/parser.py
+%%PYTHON_SITELIBDIR%%/dateutil/parser.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/parser.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/relativedelta.py
+%%PYTHON_SITELIBDIR%%/dateutil/relativedelta.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/relativedelta.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/rrule.py
+%%PYTHON_SITELIBDIR%%/dateutil/rrule.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/rrule.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/tz.py
+%%PYTHON_SITELIBDIR%%/dateutil/tz.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/tz.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/tzwin.py
+%%PYTHON_SITELIBDIR%%/dateutil/tzwin.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/tzwin.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/zoneinfo/__init__.py
+%%PYTHON_SITELIBDIR%%/dateutil/zoneinfo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dateutil/zoneinfo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dateutil/zoneinfo/zoneinfo--latest.tar.gz
+@dirrm %%PYTHON_SITELIBDIR%%/dateutil/zoneinfo
+@dirrm %%PYTHON_SITELIBDIR%%/dateutil
___
freebsd-python@freebsd.org mailing
[patch] fix PYTHON_VERSION in py-setuptoolsXX
The current settings in py-setuptools{27,32,33,34}/Makefile for
PYTHON_VERSION are wrong (X.Y instead of pythonX.Y), but sort of work
by chance rather than design. If it weren't for some unintended luck
from the way _PYTHON_VERSION is set and the .MAKEFLAGS line in
bsd.python.mk that forcibly sets
PYTHON_VERSION=python${_PYTHON_VERSION}, these ports would fail with
something like:
Makefile error: bad value for PYTHON_VERSION: 3.3.
Legal values are:
python2.7 (default)
python3.1
python3.2
python3.3
python3.4
Please fix:
Index: py-setuptools27/Makefile
===
--- py-setuptools27/Makefile(revision 350922)
+++ py-setuptools27/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=2.7
+PYTHON_VERSION=python2.7
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: py-setuptools32/Makefile
===
--- py-setuptools32/Makefile(revision 350922)
+++ py-setuptools32/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=3.2
+PYTHON_VERSION=python3.2
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: py-setuptools33/Makefile
===
--- py-setuptools33/Makefile(revision 350922)
+++ py-setuptools33/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=3.3
+PYTHON_VERSION=python3.3
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: py-setuptools34/Makefile
===
--- py-setuptools34/Makefile(revision 350922)
+++ py-setuptools34/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=3.4
+PYTHON_VERSION=python3.4
MASTERDIR= ${.CURDIR}/../py-setuptools
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[patch] devel/py-setuptoolXY: fix PYTHON_VERSION
>Submitter-Id: current-users
>Originator: John Hein
>Organization:
>Confidential: no
>Synopsis: [patch] devel/py-setuptoolXY: fix PYTHON_VERSION
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release:
>Environment:
>Description:
The current settings in py-setuptools{27,32,33,34}/Makefile for
PYTHON_VERSION are wrong (X.Y instead of pythonX.Y), but sort of work
by chance rather than design. If it weren't for some unintended luck
from the way _PYTHON_VERSION is set and the .MAKEFLAGS line in
bsd.python.mk that forcibly sets
PYTHON_VERSION=python${_PYTHON_VERSION}, these ports would fail with
something like:
Makefile error: bad value for PYTHON_VERSION: 3.3.
Legal values are:
python2.7 (default)
python3.1
python3.2
python3.3
python3.4
>How-To-Repeat:
>Fix:
Index: py-setuptools27/Makefile
===
--- py-setuptools27/Makefile(revision 350922)
+++ py-setuptools27/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=2.7
+PYTHON_VERSION=python2.7
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: py-setuptools32/Makefile
===
--- py-setuptools32/Makefile(revision 350922)
+++ py-setuptools32/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=3.2
+PYTHON_VERSION=python3.2
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: py-setuptools33/Makefile
===
--- py-setuptools33/Makefile(revision 350922)
+++ py-setuptools33/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=3.3
+PYTHON_VERSION=python3.3
MASTERDIR= ${.CURDIR}/../py-setuptools
Index: py-setuptools34/Makefile
===
--- py-setuptools34/Makefile(revision 350922)
+++ py-setuptools34/Makefile(working copy)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
-PYTHON_VERSION=3.4
+PYTHON_VERSION=python3.4
MASTERDIR= ${.CURDIR}/../py-setuptools
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: Make python27 build as an unprivileged user
Antoine Brodin wrote at 11:57 +0200 on Apr 4, 2014: > On Fri, Apr 4, 2014 at 12:51 AM, Julio Merino wrote: > > On Thu, Apr 3, 2014 at 3:30 PM, Antoine Brodin wrote: > >> koobs' new python34 port (not committed yet) packages fine as non > >> root, so it seems doable. > > > > Sorry but I don't see how that's relevant. Python 3.4 is a much more > > modern package than 2.7 and many things may have changed in its build > > infrastructure. > > > > Yes, fixing the root cause is doable for sure, and I agree with you > > that, ideally, this should be properly fixed. But: I don't think it's > > worth our time considering that: 1) this is for the "old" 2.x branch > > and 2) some knowledgeable people have already tried and failed at > > doing so. > > > > As things currently are, the python27 package is broken when building > > from ports as non-root. (Which by the way is annoying for > > architectures without prebuilt packages; I have found this problem > > under powerpc64!) > > > > What I'm proposing is that we trivially workaround the problem by > > *temporarily* defining NEED_ROOT and later investigating the failure. > > Doing the former does not preclude the latter, but at least fixes the > > obvious bug. > > > > I don't want to put words on your mouth, but what I think you are > > proposing is that we leave the package broken for an arbitrary > > (possibly infinite) amount of time until someone decides to track and > > fix the root cause. If you are offering to investigate this relatively > > soon as the maintainer that's perfect though. > > > > So up to you really! If you do not agree with the workaround, I will > > at least file a PR for proper tracking. > > Try attached patch. > > Cheers, > > Antoine > Allow staging python27 as a regular user: > > - when compiling, don't compile the running command otherwise it fails to > compile modules imported by the running command > > Sorry [Errno 13] Permission denied: > '/wrkdirs/usr/ports/lang/python27/work/stage/usr/local/lib/python2.7/getopt.pyc' > Sorry [Errno 13] Permission denied: > '/wrkdirs/usr/ports/lang/python27/work/stage/usr/local/lib/python2.7/py_compile.pyc' > Sorry [Errno 13] Permission denied: > '/wrkdirs/usr/ports/lang/python27/work/stage/usr/local/lib/python2.7/struct.pyc' > Sorry [Errno 13] Permission denied: > '/wrkdirs/usr/ports/lang/python27/work/stage/usr/local/lib/python2.7/getopt.pyo' > Sorry [Errno 13] Permission denied: > '/wrkdirs/usr/ports/lang/python27/work/stage/usr/local/lib/python2.7/py_compile.pyo' > Sorry [Errno 13] Permission denied: > '/wrkdirs/usr/ports/lang/python27/work/stage/usr/local/lib/python2.7/struct.pyo' > > - ranlib before installing read only > > Index: lang/python27/files/patch-Makefile.pre.in > === > --- lang/python27/files/patch-Makefile.pre.in(revision 350060) > +++ lang/python27/files/patch-Makefile.pre.in(working copy) > @@ -1,6 +1,6 @@ > ./Makefile.pre.in.orig 2013-04-06 18:02:34.0 +0400 > -+++ ./Makefile.pre.in 2013-04-07 22:30:19.0 +0400 > -@@ -281,9 +281,9 @@ > +--- ./Makefile.pre.in.orig 2013-11-10 07:36:41.0 + > ./Makefile.pre.in 2014-04-04 09:16:00.0 + > +@@ -285,9 +285,9 @@ > > ## > # AST > @@ -12,3 +12,28 @@ > AST_C= $(AST_C_DIR)/Python-ast.c > AST_ASDL= $(srcdir)/Parser/Python.asdl > > +@@ -1006,12 +1006,12 @@ > +$(DESTDIR)$(LIBDEST)/distutils/tests ; \ > +fi > +PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ > +- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ > ++ $(PYTHON_FOR_BUILD) -B -Wi -tt > $(DESTDIR)$(LIBDEST)/compileall.py \ > +-d $(LIBDEST) -f \ > +-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ > +$(DESTDIR)$(LIBDEST) > +PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ > +- $(PYTHON_FOR_BUILD) -Wi -tt -O > $(DESTDIR)$(LIBDEST)/compileall.py \ > ++ $(PYTHON_FOR_BUILD) -B -Wi -tt -O > $(DESTDIR)$(LIBDEST)/compileall.py \ > +-d $(LIBDEST) -f \ > +-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ > +$(DESTDIR)$(LIBDEST) > +@@ -1089,8 +1089,8 @@ > +if test "$(SO)" = .dll; then \ > +$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) > ; \ > +else \ > ++ $(RANLIB) $(LIBRARY) ; \ > +$(INSTALL_DATA) $(LIBRARY) > $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ > +- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ > +fi; \ > +else \ > +echo Skip install of $(LIBRARY) - use make > fra
imageop.so & rbgimg.so 32BIT_ONLY, not X86_ONLY?
I just built python on arm and it installed lib-dynload/imageop.so &
lib-dynload/rbgimg.so.
However, they are marked X86_ONLY in pkg-plist (in all python2x ports).
They were installed since the test in setup.py is ...
./setup.py-# Disabled on 64-bit platforms
./setup.py-if sys.maxint != 9223372036854775807L:
./setup.py-# Operations on images
./setup.py:exts.append( Extension('imageop', ['imageop.c']) )
./setup.py-# Read SGI RGB image files (but coded portably)
./setup.py-exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
./setup.py-
But arm (well, at least this arm) is 32 bit.
It seems python2*/pkg-plist should be changed like so...
Index: pkg-plist
===
RCS file: /base/FreeBSD-CVS/ports/lang/python24/pkg-plist,v
retrieving revision 1.65
diff -u -p -r1.65 pkg-plist
--- pkg-plist 16 Mar 2008 10:25:08 - 1.65
+++ pkg-plist 19 Dec 2008 17:34:51 -
@@ -568,7 +568,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%32BIT_ONLYPYTHON_LIBDIR%%/lib-dynload/dl.so
%%PYTHON_LIBDIR%%/lib-dynload/fcntl.so
%%PYTHON_LIBDIR%%/lib-dynload/grp.so
-%%X86_ONLYPYTHON_LIBDIR%%/lib-dynload/imageop.so
+%%32BIT_ONLYPYTHON_LIBDIR%%/lib-dynload/imageop.so
%%PYTHON_LIBDIR%%/lib-dynload/itertools.so
%%PYTHON_LIBDIR%%/lib-dynload/math.so
%%PYTHON_LIBDIR%%/lib-dynload/md5.so
@@ -581,7 +581,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/readline.so
%%PYTHON_LIBDIR%%/lib-dynload/regex.so
%%PYTHON_LIBDIR%%/lib-dynload/resource.so
-%%X86_ONLYPYTHON_LIBDIR%%/lib-dynload/rgbimg.so
+%%32BIT_ONLYPYTHON_LIBDIR%%/lib-dynload/rgbimg.so
%%PYTHON_LIBDIR%%/lib-dynload/select.so
%%PYTHON_LIBDIR%%/lib-dynload/sha.so
%%PYTHON_LIBDIR%%/lib-dynload/strop.so
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[patch] fix EOPNOTSUPP for copy2/copystat in python2.6
>Submitter-Id: current-users
>Originator: John Hein
>Organization:
>Confidential: no
>Synopsis: [patch] fix EOPNOTSUPP for copy2/copystat in python2.6
>Severity: non-critical
>Priority: medium
>Category: ports
>Class: sw-bug
>Release:
>Environment:
>Description:
shutil.copystat() can generate an exception when the source is FreeBSD and
the destination is a filesystem that does not support chflags(2)
(e.g., nfs, zfs).
Also affected is shutil.copy2() which calls copystat().
This also affects various operations in mercurial which uses copy2.
>How-To-Repeat:
touch /tmp/file-on-freebsd-ufs
python -c 'import shutil; shutil.copy2("/tmp/file-on-freebsd-ufs",
"/dest/nfs/mount/.")'
Traceback (most recent call last):
File "", line 1, in
File "/site/dist/python/lib/python2.6/shutil.py", line 100, in copy2
copystat(src, dst)
File "/site/dist/python/lib/python2.6/shutil.py", line 77, in copystat
os.chflags(dst, st.st_flags)
OSError: [Errno 45] Operation not supported:
'/dest/nfs/mount/./file-on-freebsd-ufs'
>Fix:
This is not needed for lang/python25 where copystat does not
try to copy the flags.
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/lang/python26/Makefile,v
retrieving revision 1.167
diff -u -p -r1.167 Makefile
--- Makefile19 Jul 2010 21:59:27 - 1.167
+++ Makefile27 Jul 2010 16:54:18 -
@@ -6,7 +6,7 @@
PORTNAME= python26
PORTVERSION= 2.6.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES=lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR=${PYTHON_MASTER_SITE_SUBDIR}
Index: files/patch-copystat
===
RCS file: files/patch-copystat
diff -N files/patch-copystat
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/patch-copystat27 Jul 2010 16:53:46 -
@@ -0,0 +1,41 @@
+# $FreeBSD$
+
+Work around 'Operation not supported' issues when using copystat()
+(and copy2() which calls copystat()) to a filesystem destination
+that does not support chflags(2) (e.g., nfs, zfs).
+
+http://bugs.python.org/issue7512
+
+This has already been applied upstream and 2.7 has it already.
+
+http://svn.python.org/view/python/branches/release26-maint/Lib/shutil.py?view=diff&pathrev=79300&r1=79299&r2=79300
+
+Also affects mercurial...
+
+http://www.selenic.com/pipermail/mercurial/2010-March/030716.html
+
+diff -r 4207e9a39b78 Lib/shutil.py
+--- a/Lib/shutil.pyTue Dec 15 03:25:27 2009 +
b/Lib/shutil.pyTue Dec 15 15:25:31 2009 +0800
+@@ -9,6 +9,7 @@
+ import stat
+ from os.path import abspath
+ import fnmatch
++import errno
+
+ __all__ = ["copyfileobj","copyfile","copymode","copystat","copy","copy2",
+"copytree","move","rmtree","Error", "SpecialFileError"]
+@@ -88,8 +89,11 @@
+ if hasattr(os, 'chmod'):
+ os.chmod(dst, mode)
+ if hasattr(os, 'chflags') and hasattr(st, 'st_flags'):
+-os.chflags(dst, st.st_flags)
+-
++try:
++os.chflags(dst, st.st_flags)
++except OSError, why:
++if not hasattr(errno, 'EOPNOTSUPP') or why.errno !=
errno.EOPNOTSUPP:
++raise
+
+ def copy(src, dst):
+ """Copy data and mode bits ("cp src dst").
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/149005: [patch] fix EOPNOTSUPP for copy2/copystat in lang/python2.6
The following reply was made to PR ports/149005; it has been noted by GNATS. From: John Hein To: bug-follo...@freebsd.org Cc: freebsd-ports-b...@freebsd.org, freebsd-python@FreeBSD.org Subject: Re: ports/149005: [patch] fix EOPNOTSUPP for copy2/copystat in lang/python2.6 Date: Sun, 26 Sep 2010 14:19:55 -0600 This PR can be closed. The patch was merged to python 2.6.6 upstream, and lang/python2.6 was updated to 2.6.6 on 2010-09-12 ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/149005: [patch] fix EOPNOTSUPP for copy2/copystat in lang/python2.6
This PR can be closed. The patch was merged to python 2.6.6 upstream, and lang/python2.6 was updated to 2.6.6 on 2010-09-12 ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[patch] update lang/python-doc-*
>Submitter-Id: current-users >Originator: John Hein >Organization: >Confidential: no >Synopsis: update python-doc-* >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: >Environment: >Description: python-2.7 has been out since July. Attached is a patch to update the python-docs* ports to install 2.7 docs. It also removes obsolete MD5 signatures from distinfo and adds text doc tarballs for python-2.6.6 >How-To-Repeat: >Fix: Index: distinfo === RCS file: /base/FreeBSD-CVS/ports/lang/python-doc-html/distinfo,v retrieving revision 1.31 diff -u -p -r1.31 distinfo --- distinfo14 Sep 2010 01:23:42 - 1.31 +++ distinfo12 Nov 2010 18:18:44 - @@ -1,72 +1,3 @@ -MD5 (python/html-2.4.1.tar.bz2) = 00fb0aee372eae2d9cef649853dfc5d8 -MD5 (python/html-2.4.2.tar.bz2) = 4e3f177f32e15713130d9d9cf35f991f -MD5 (python/html-2.4.3.tar.bz2) = 86edf38b83fde1ff44d0725acf90c95c -MD5 (python/html-2.4.4.tar.bz2) = 21259033b5663533ed64b4592c6925e2 -MD5 (python/html-2.4.tar.bz2) = 10cca09fcdf1b5ad269bc9edb652d76f -MD5 (python/html-2.5.1.tar.bz2) = 74e14b4713a1a43adebdcfe0191c20c8 -MD5 (python/html-2.5.2.tar.bz2) = b264d979f7b3e4c0243bec3a039a6464 -MD5 (python/html-2.5.4.tar.bz2) = b4041ec1faf9b6070aad451eeb5ab487 -MD5 (python/html-2.5.tar.bz2) = 3badfa2d460f52b7f9face12abdb2e91 -MD5 (python/pdf-a4-2.4.1.tar.bz2) = 5a15fc66b7b3a927c2f1c503fa41dec7 -MD5 (python/pdf-a4-2.4.2.tar.bz2) = f9712931eb8dd46596eec0694bfc -MD5 (python/pdf-a4-2.4.3.tar.bz2) = 85f82cb2df6872e4d6ef3652be184b50 -MD5 (python/pdf-a4-2.4.4.tar.bz2) = 2b43ac2c9948af26af61c792397bc3fb -MD5 (python/pdf-a4-2.4.tar.bz2) = 8f6b0a891dbff04f3b6ab07d9f8f6df6 -MD5 (python/pdf-a4-2.5.1.tar.bz2) = ade64ff41d24983ad2ea837525f5399a -MD5 (python/pdf-a4-2.5.2.tar.bz2) = 1c8bfb593b251a8543488e5c6e339aeb -MD5 (python/pdf-a4-2.5.4.tar.bz2) = 1693b22aa19e25e0fff8799ac5753f71 -MD5 (python/pdf-a4-2.5.tar.bz2) = 9cc4e5a2992fb7be2373c3e03c765536 -MD5 (python/pdf-letter-2.4.1.tar.bz2) = c4b988a0d09adb3d120121395d679e2e -MD5 (python/pdf-letter-2.4.2.tar.bz2) = 82d1ae6045042c08a6a68f69fe2831c2 -MD5 (python/pdf-letter-2.4.3.tar.bz2) = 2f503f360ecd06fde2efdc61b4f1e644 -MD5 (python/pdf-letter-2.4.4.tar.bz2) = 80da7a7611b11f4ac059a84d63af3b0e -MD5 (python/pdf-letter-2.4.tar.bz2) = 46e9741fa8d42c813d02f2d7c3342c55 -MD5 (python/pdf-letter-2.5.1.tar.bz2) = bb77cbbf217dfe93fcbecd7256be33a3 -MD5 (python/pdf-letter-2.5.2.tar.bz2) = 7781a2ad470e45c1ad24294a8fe9d8c5 -MD5 (python/pdf-letter-2.5.tar.bz2) = e58eef4dcf9384ef7ee105068f7bc26e -MD5 (python/pdf-letter-2.5.4.tar.bz2) = 5934d687fbb950a3f0a25b2c2b4fbb33 -MD5 (python/postscript-a4-2.4.1.tar.bz2) = 64b0ab6de74ea5620d558b2f9fd7b1ee -MD5 (python/postscript-a4-2.4.2.tar.bz2) = 2ef6f2128333042f82c365697ac8d5be -MD5 (python/postscript-a4-2.4.3.tar.bz2) = f71f0b6d8ba57a4d7b8cf918bab0 -MD5 (python/postscript-a4-2.4.4.tar.bz2) = 8680d3d6043a0dd3d6683e2fb727c2ab -MD5 (python/postscript-a4-2.4.tar.bz2) = 261da37a6faf721846e27e44f3c12f62 -MD5 (python/postscript-a4-2.5.1.tar.bz2) = a3385edf8ca8749959caea9d653bb5e7 -MD5 (python/postscript-a4-2.5.2.tar.bz2) = af74a3dadb9f85cbb34abf8f11d632b1 -MD5 (python/postscript-a4-2.5.4.tar.bz2) = 60ebddd507acbfb52470c36bcca7d3d6 -MD5 (python/postscript-a4-2.5.tar.bz2) = 831964fa3d53b3afe973995d7fcc05b2 -MD5 (python/postscript-letter-2.4.1.tar.bz2) = 37465c3e957a5836901238193c3bcc88 -MD5 (python/postscript-letter-2.4.2.tar.bz2) = 11d90c85951dc2439e0f32459380dbbd -MD5 (python/postscript-letter-2.4.3.tar.bz2) = ca001fb091019aadb66a25226768c523 -MD5 (python/postscript-letter-2.4.4.tar.bz2) = 3daa1afbaff58db82b22b45efc528ccd -MD5 (python/postscript-letter-2.4.tar.bz2) = a54ca46c53f0ed8e2f47e94286c7a419 -MD5 (python/postscript-letter-2.5.1.tar.bz2) = c72bd8f549745e75bfdb00b40eb05285 -MD5 (python/postscript-letter-2.5.2.tar.bz2) = 45a86e5aa093d91ab1e8c0757a1ca7d1 -MD5 (python/postscript-letter-2.5.4.tar.bz2) = 77ebec508a9c5eedd75956b060aba2dd -MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf -MD5 (python260/python-docs-html.tar.bz2) = cfcd4b9b00ba1e7496b5d823692370a4 -MD5 (python260/python-docs-pdf-a4.tar.bz2) = d5e1fd4e178887d2b42a619da15bfcbd -MD5 (python260/python-docs-pdf-letter.tar.bz2) = 7b7ee0c4fe014eaa14862a1a4c71701e -MD5 (python260/python-docs-text.tar.bz2) = e2d4dea9a16b150327f5e80413dbc41e -MD5 (python261/python-docs-html.tar.bz2) = 269233817c4275f32c4163fa5883514b -MD5 (python261/python-docs-pdf-a4.tar.bz2) = 7b5359211bf6fc986b0b6ed42c8a15e5 -MD5 (python261/python-docs-pdf-letter.tar.bz2) = 3519a319ab0b14df186991ac101b246c -MD5 (python261/python-docs-text.tar.bz2) = 0786ef8140a2a0f4a22aef2fa7e53ad1 -MD5 (python262/python-2.6.2-docs-html.tar.bz2) = 15a2dac727692e4ff8fe92958d4e633c -MD5 (python263/python-2.6.3-docs-html.tar.bz2) = 8b86d8c31590616637cb79d5e88eb87f -MD5
[NEW PORT] lang/python-doc-text: Documentation for the Python programming language
>Submitter-Id: current-users
>Originator: John Hein
>Organization:
>Confidential: no
>Synopsis: [NEW PORT] lang/python-doc-text: Documentation for the Python
>programming language
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release:
>Environment:
>Description:
Add a port for the text version of the python docs (much smaller).
This needs to have ports/152185 committed first to get the
newer text tarballs into distinfo...
http://www.freebsd.org/cgi/query-pr.cgi?pr=152185
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- python-doc-text-2.6.6.shar begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# python-doc-text
# python-doc-text/Makefile
#
echo c - python-doc-text
mkdir -p python-doc-text > /dev/null 2>&1
echo x - python-doc-text/Makefile
sed 's/^X//' >python-doc-text/Makefile << '08630dd9457f04a58755bc13378e8940'
X# New ports collection makefile for: python-doc-text
X# Date created:12 November 2010
X# Whom:John Hein
X#
X# $FreeBSD$
X#
X
XDOCFORMAT= text
XMASTERDIR= ${.CURDIR}/../python-doc-html
X
X.include "${MASTERDIR}/Makefile"
08630dd9457f04a58755bc13378e8940
exit
--- python-doc-text-2.6.6.shar ends here ---
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[patch] fix installed permissions for lang/python27
>Submitter-Id: current-users
>Originator: John Hein
>Organization:
>Confidential: no
>Synopsis: [patch] fix installed permissions for lang/python27
>Severity: non-critical
>Priority: low
>Category: ports
>Class: update
>Release:
>Environment:
>Description:
The distribution tarball for python 2.7 has permission bits for 'others'
set to 0 for the entire tarball.
During install, lang/python27 copies Tools and Demo (using tar) to the installed
prefix. Because of the tarball permissions, this renders them readable only by
the installer (usually uid 0) or members of the installer's group (usually gid
0).
Furthermore, the tar during post-install does not use --no-same-owner,
so the installed files are owned by the builder, which often is not
root. If using INSTALL_AS_USER, this doesn't matter. But if not
using INSTALL_AS_USER (which is more common), then the common
'make && sudo make install' sequence (or some similar equivalent) will
cause the files to be writable by the building user.
While this probably doesn't matter that much (that just means the
build user will be able to write to files that were installed by root,
and more than likely the build user is trusted), it's more correct to
have them owned by the installer (usually uid 0).
The --no-same-owner fix should also be applied to lang/python2X (where
X < 7) as well.
The distribution tarball fix is not necessary for python26 (I didn't
look further back than that) which has more normal permissions in its
distribution tarball.
>How-To-Repeat:
>Fix:
Fix permissions of extracted tarball for pieces that are copied
during post-inastll.
Use tar --no-same-owner during post-install to ensure copied files
are owned by install user.
--- Makefile.orig 2010-09-05 18:25:04.0 -0600
+++ Makefile2010-11-13 19:39:03.0 -0700
@@ -146,6 +146,13 @@
CONFIGURE_ARGS+= --with-fpectl
.endif
+post-extract:
+# The distribution tarball for python 2.7 has permission bits for 'others'
+# set to 0. Later during install, we copy Tools and Demo to the installed
+# prefix, so set them right here.
+ ${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type d | ${XARGS} ${CHMOD} a+rx
+ ${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type f | ${XARGS} ${CHMOD} a+r
+
pre-patch:
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd9
@@ -260,12 +267,12 @@
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
- (cd ${DATADIR}; ${TAR} -xf -)
+ (cd ${DATADIR}; ${TAR} --no-same-owner -xf -)
.endif
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
- (cd ${EXAMPLESDIR}; ${TAR} -xf -)
+ (cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)
.endif
@${CAT} ${PKGMESSAGE}
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: FreeBSD Port: python27-2.7.0_1
John Hein wrote at 15:55 MDT on Oct 30, 2010: > Maxim Khitrov wrote at 15:42 -0400 on Oct 30, 2010: > > On Sat, Oct 30, 2010 at 2:46 PM, Sylvain Garrigues > wrote: > > > Hello, > > > > > > I am using FreeBSD 8.1 and I would like to know the reasons > > > why it has been decided that the default Python installation > > > is 2.6 and not 2.7. > > > > > > Thanks in advance. > > > > Add "PYTHON_DEFAULT_VERSION=python2.7" to /etc/make.conf. To answer Sylvain's original query, 2.7 is fairly new still. When a sufficent amount of testing has occurred that indicates 2.7 has no regressions, then someone will throw the switch. Of course, what constitutes a sufficient amount of testing is somewhat subjective. So the more use it gets by early adopters (such as yourself presumably), the higher the confidence in being able to update the default. I've been using python27 for a couple months now without any problems. To help get the default switched from 2.6 to 2.7, request it and report any successes (and problems) here and/or submit PRs. A search in the PR database for python27 doesn't turn up any significant problems. It will also probably require at least one full ports test build. I don't know if one has been requested. ___ freebsd-python@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-python To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/152224: [patch] fix installed permissions for lang/python27
The following reply was made to PR ports/152224; it has been noted by GNATS.
From: John Hein
To: Anonymous ,
bug-follo...@freebsd.org
Cc:
Subject: Re: ports/152224: [patch] fix installed permissions for lang/python27
Date: Sun, 14 Nov 2010 15:19:33 -0700
--CJa2am+ero
Content-Type: text/plain; charset=us-ascii
Content-Description: message body text
Content-Transfer-Encoding: 7bit
John Hein wrote at 10:49 MST on Nov 14, 2010:
> Anonymous wrote at 07:04 +0300 on Nov 14, 2010:
> > John Hein writes:
> >
> > [...]
> > > Fix permissions of extracted tarball for pieces that are copied
> > > during post-inastll.
> > >
> > > Use tar --no-same-owner during post-install to ensure copied files
> > > are owned by install user.
> >
> > I'm not sure `--no-same-owner' is available on 6.x, better use `-o'.
Yes, I checked tar compatibility.
--no-same-owner is available... in gnu tar available in
6.x's base or a port and if someone has installed bsdtar from ports.
bsd.port.mk uses it, too.
> > > +post-extract:
> > > +# The distribution tarball for python 2.7 has permission bits for
'others'
> > > +# set to 0. Later during install, we copy Tools and Demo to the
installed
> > > +# prefix, so set them right here.
> > > + ${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type d | ${XARGS}
${CHMOD} a+rx
> > > + ${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type f | ${XARGS}
${CHMOD} a+r
> > > +
> >
> > This can be reduced to one command
> >
> > ${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo \
> > -type d -exec ${CHMOD} a+rx {} + \
> > -or -type f -exec ${CHMOD} a+r {} +
Indeed, good idea... updated patch:
--CJa2am+ero
Content-Type: text/plain; name="p"
Content-Description: fix installed permissions for lang/python27
Content-Disposition: inline;
filename="p"
Content-Transfer-Encoding: 7bit
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/lang/python27/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile 6 Sep 2010 00:25:04 - 1.169
+++ Makefile 14 Nov 2010 22:16:27 -
@@ -146,6 +146,14 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --with-fpectl
.endif
+post-extract:
+# The distribution tarball for python 2.7 has permission bits for 'others'
+# set to 0. Later during install, we copy Tools and Demo to the installed
+# prefix, so set them right here.
+ ${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo \
+ -type d -exec ${CHMOD} a+rx {} + \
+ -or -type f -exec ${CHMOD} a+r {} +
+
pre-patch:
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd9
@@ -260,12 +268,12 @@ post-install:
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
- (cd ${DATADIR}; ${TAR} -xf -)
+ (cd ${DATADIR}; ${TAR} --no-same-owner -xf -)
.endif
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
- (cd ${EXAMPLESDIR}; ${TAR} -xf -)
+ (cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)
.endif
@${CAT} ${PKGMESSAGE}
--CJa2am+ero--
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/152224: [patch] fix installed permissions for ?lang/python27
Oliver Fromme wrote at 18:35 +0100 on Nov 15, 2010:
> Anonymous wrote:
> > John Hein writes:
> > > +post-extract:
> > > +# The distribution tarball for python 2.7 has permission bits for
> 'others'
> > > +# set to 0. Later during install, we copy Tools and Demo to the
> installed
> > > +# prefix, so set them right here.
> > > +${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type d | ${XARGS} ${CHMOD}
> a+rx
> > > +${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type f | ${XARGS} ${CHMOD}
> a+r
> > > +
> >
> > This can be reduced to one command
> >
> >${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo \
> >-type d -exec ${CHMOD} a+rx {} + \
> >-or -type f -exec ${CHMOD} a+r {} +
>
> It's unclear to me why you have to use find(1) at all.
> The following simple command should work equally well:
>
> ${CHMOD} -R og=u-w ${WRKSRC}/Tools ${WRKSRC}/Demo
Yes, that's better still and will work fine since the user bits are
good in the tarball. Updated patch (with a fix for the path, too)...
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/lang/python27/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile6 Sep 2010 00:25:04 - 1.169
+++ Makefile15 Nov 2010 18:16:55 -
@@ -146,6 +146,12 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --with-fpectl
.endif
+post-extract:
+# The distribution tarball for python 2.7 has permission bits for 'others'
+# set to 0. Later during install, we copy Tools and Demo to the installed
+# prefix, so set them right here.
+ ${CHMOD} og=u-w ${PYTHON_WRKSRC}/Tools ${PYTHON_WRKSRC}/Demo
+
pre-patch:
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd9
@@ -260,12 +266,12 @@ post-install:
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
- (cd ${DATADIR}; ${TAR} -xf -)
+ (cd ${DATADIR}; ${TAR} --no-same-owner -xf -)
.endif
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
- (cd ${EXAMPLESDIR}; ${TAR} -xf -)
+ (cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)
.endif
@${CAT} ${PKGMESSAGE}
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/152224: [patch] fix installed permissions for ?lang/python27
The following reply was made to PR ports/152224; it has been noted by GNATS.
From: John Hein
To: Oliver Fromme
Cc: Anonymous ,
pyt...@freebsd.org,
bug-follo...@freebsd.org
Subject: Re: ports/152224: [patch] fix installed permissions for ?lang/python27
Date: Mon, 15 Nov 2010 11:21:06 -0700
--9oaHwTfnCu
Content-Type: text/plain; charset=us-ascii
Content-Description: message body text
Content-Transfer-Encoding: 7bit
Oliver Fromme wrote at 18:35 +0100 on Nov 15, 2010:
> Anonymous wrote:
> > John Hein writes:
> > > +post-extract:
> > > +# The distribution tarball for python 2.7 has permission bits for
'others'
> > > +# set to 0. Later during install, we copy Tools and Demo to the
installed
> > > +# prefix, so set them right here.
> > > +${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type d | ${XARGS}
${CHMOD} a+rx
> > > +${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo -type f | ${XARGS}
${CHMOD} a+r
> > > +
> >
> > This can be reduced to one command
> >
> >${FIND} ${WRKSRC}/Tools ${WRKSRC}/Demo \
> >-type d -exec ${CHMOD} a+rx {} + \
> >-or -type f -exec ${CHMOD} a+r {} +
>
> It's unclear to me why you have to use find(1) at all.
> The following simple command should work equally well:
>
> ${CHMOD} -R og=u-w ${WRKSRC}/Tools ${WRKSRC}/Demo
Yes, that's better still and will work fine since the user bits are
good in the tarball. Updated patch (with a fix for the path, too)...
--9oaHwTfnCu
Content-Type: text/plain; name="p"
Content-Description: just use chmod; fix path with PYTHON_WRKSRC
Content-Disposition: inline;
filename="p"
Content-Transfer-Encoding: 7bit
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/lang/python27/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile 6 Sep 2010 00:25:04 - 1.169
+++ Makefile 15 Nov 2010 18:16:55 -
@@ -146,6 +146,12 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --with-fpectl
.endif
+post-extract:
+# The distribution tarball for python 2.7 has permission bits for 'others'
+# set to 0. Later during install, we copy Tools and Demo to the installed
+# prefix, so set them right here.
+ ${CHMOD} og=u-w ${PYTHON_WRKSRC}/Tools ${PYTHON_WRKSRC}/Demo
+
pre-patch:
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd9
@@ -260,12 +266,12 @@ post-install:
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
- (cd ${DATADIR}; ${TAR} -xf -)
+ (cd ${DATADIR}; ${TAR} --no-same-owner -xf -)
.endif
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
- (cd ${EXAMPLESDIR}; ${TAR} -xf -)
+ (cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)
.endif
@${CAT} ${PKGMESSAGE}
--9oaHwTfnCu--
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/152224: [patch] fix installed permissions for lang/python27
The following reply was made to PR ports/152224; it has been noted by GNATS.
From: John Hein
To: bug-follo...@freebsd.org
Cc: freebsd-python@FreeBSD.org
Subject: Re: ports/152224: [patch] fix installed permissions for lang/python27
Date: Sun, 28 Nov 2010 17:23:48 -0700
--8qxSgvgPz6
Content-Type: text/plain; charset=us-ascii
Content-Description: message body text
Content-Transfer-Encoding: 7bit
This patch is still needed for python 2.7.1
The 2.7.1 distribution tarball doesn't have 'other' permissions set,
so the post-extract is still needed.
The second part that uses --no-same-owner with tar in post-install is
still needed in general to avoid having the installed files owned by
the build user. [As described in the original report, this is needed
for at least python26 as well].
--8qxSgvgPz6
Content-Type: text/plain; name="p"
Content-Description: fix permissions for lang/python27
Content-Disposition: inline;
filename="p"
Content-Transfer-Encoding: 7bit
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/lang/python27/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile 6 Sep 2010 00:25:04 - 1.169
+++ Makefile 29 Nov 2010 00:15:42 -
@@ -146,6 +146,12 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --with-fpectl
.endif
+post-extract:
+# The distribution tarball for python 2.7 has permission bits for 'others'
+# set to 0. Later during install, we copy Tools and Demo to the installed
+# prefix, so set them right here.
+ ${CHMOD} og=u-w ${PYTHON_WRKSRC}/Tools ${PYTHON_WRKSRC}/Demo
+
pre-patch:
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd9
@@ -260,12 +266,12 @@ post-install:
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
- (cd ${DATADIR}; ${TAR} -xf -)
+ (cd ${DATADIR}; ${TAR} --no-same-owner -xf -)
.endif
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
- (cd ${EXAMPLESDIR}; ${TAR} -xf -)
+ (cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)
.endif
@${CAT} ${PKGMESSAGE}
--8qxSgvgPz6--
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
Re: ports/152224: [patch] fix installed permissions for lang/python27
This patch is still needed for python 2.7.1
The 2.7.1 distribution tarball doesn't have 'other' permissions set,
so the post-extract is still needed.
The second part that uses --no-same-owner with tar in post-install is
still needed in general to avoid having the installed files owned by
the build user. [As described in the original report, this is needed
for at least python26 as well].
Index: Makefile
===
RCS file: /base/FreeBSD-CVS/ports/lang/python27/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile6 Sep 2010 00:25:04 - 1.169
+++ Makefile29 Nov 2010 00:15:42 -
@@ -146,6 +146,12 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --with-fpectl
.endif
+post-extract:
+# The distribution tarball for python 2.7 has permission bits for 'others'
+# set to 0. Later during install, we copy Tools and Demo to the installed
+# prefix, so set them right here.
+ ${CHMOD} og=u-w ${PYTHON_WRKSRC}/Tools ${PYTHON_WRKSRC}/Demo
+
pre-patch:
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd9
@@ -260,12 +266,12 @@ post-install:
.if !defined(NOPORTDATA)
@${MKDIR} ${DATADIR}
@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
- (cd ${DATADIR}; ${TAR} -xf -)
+ (cd ${DATADIR}; ${TAR} --no-same-owner -xf -)
.endif
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
- (cd ${EXAMPLESDIR}; ${TAR} -xf -)
+ (cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)
.endif
@${CAT} ${PKGMESSAGE}
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"
[patch] update lang/python-doc-* for python 2.7.1
>Submitter-Id: current-users >Originator: John Hein >Organization: >Confidential: no >Synopsis: [patch] update python-doc-* for python 2.7.1 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: >Environment: >Description: Attached is a patch to update the python-docs* ports to install the recently released 2.7.1 docs. >How-To-Repeat: >Fix: Index: lang/python-doc-html/distinfo === RCS file: /base/FreeBSD-CVS/ports/lang/python-doc-html/distinfo,v retrieving revision 1.32 diff -u -p -r1.32 distinfo --- lang/python-doc-html/distinfo 15 Nov 2010 08:10:38 - 1.32 +++ lang/python-doc-html/distinfo 30 Nov 2010 03:10:37 - @@ -57,21 +57,25 @@ SHA256 (python264/python-2.6.4-docs-html SHA256 (python265/python-2.6.5-docs-html.tar.bz2) = 72ce3358cbc3c270832b03636ddd8bde5026afecd0b07744f167c78a4cb37ac2 SHA256 (python266/python-2.6.6-docs-html.tar.bz2) = 3c491db7a10d252fb02e9ae5714d5bb2abc08beec50e04caba7d2abccc750312 SHA256 (python270/python-2.7-docs-html.tar.bz2) = ec2d22b301a691541eeb8cefd4eed78158cf9aa4657b21b82117648ad3907bb3 +SHA256 (python271/python-2.7.1-docs-html.tar.bz2) = 3262387c12c1ba4e3a38b3d1b19723cc46e09e6e20f7fd1b62825ae8ba1ad4a0 SHA256 (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = a40d6ffb0ffbe9f3ace1d28559a96beb19218f2e5fa366c66dd42520b18bdc27 SHA256 (python263/python-2.6.3-docs-pdf-a4.tar.bz2) = b7d543267e13beb7d5004b2f4e4354fab5c0bdc8ddbc1d4e80baea5a3bee096f SHA256 (python264/python-2.6.4-docs-pdf-a4.tar.bz2) = ec4cb3a1170f50b354497f60d796047be926f6f8b1c34b114378c5fdb8a164ab SHA256 (python265/python-2.6.5-docs-pdf-a4.tar.bz2) = fdcfffefeacf8285a9d2aa85ef245b132c0d00bf741443b75c70c5baf840 SHA256 (python266/python-2.6.6-docs-pdf-a4.tar.bz2) = 8d8b1c6a38740cbff7fd925e00bf90e649fb482309c890fb143f51f176116e01 SHA256 (python270/python-2.7-docs-pdf-a4.tar.bz2) = 4864a111d8d7feb623f886c4d8218bef2cb77a353cc5769e9e7f3303b727c84a +SHA256 (python271/python-2.7.1-docs-pdf-a4.tar.bz2) = deeff193dc3f2df750f2d9763f788407bb3b9663663a75224628dbb27fe53ead SHA256 (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 20409bd1e33930be17b1a0d7fb5e098641be10c252b68bcac3205efa5aa21ef2 SHA256 (python263/python-2.6.3-docs-pdf-letter.tar.bz2) = a1249a9dca0357afe39ee5164071297974195149b68a98a82179e8d409d58534 SHA256 (python264/python-2.6.4-docs-pdf-letter.tar.bz2) = 32f3c3790660f75592df9a7b50958bf979e33c5b2d3958f0911f5ef195f5df69 SHA256 (python265/python-2.6.5-docs-pdf-letter.tar.bz2) = 8044b6650d5ff4224751263a88b49642581f6ac110adad73f81ac3b35a85e827 SHA256 (python266/python-2.6.6-docs-pdf-letter.tar.bz2) = 02609a5bf7a206f0a0035c34888cb1e57bdc47b920cb010923677026d0e709d6 SHA256 (python270/python-2.7-docs-pdf-letter.tar.bz2) = db72ea299a2b1f9b71003ca938fcd1723d988b6b001e70eaa0f02a36d6f4eea8 +SHA256 (python271/python-2.7.1-docs-pdf-letter.tar.bz2) = 208c1ad07dd56962a8b18e7a34b86421b473a61263dfd0b6e434c66e1600f017 SHA256 (python262/python-2.6.2-docs-text.tar.bz2) = f7d8c6aaece010bfaf374322cc782816fffe232f7fb440f34f585adfd6e94b04 SHA256 (python266/python-2.6.6-docs-text.tar.bz2) = f156387af32a9eff439627844729e0202a4bd399425eb948a6cd4cadd8c95167 SHA256 (python270/python-2.7-docs-text.tar.bz2) = 6da941f0bdb39376d650d8a4fefd4cbe87f343a6ae92bc981087df30c6853b34 +SHA256 (python271/python-2.7.1-docs-text.tar.bz2) = 896412265bdcab4b0cd2a5936a9f3d0e08c517fdeabc47cbd0e70c035af158a2 SIZE (python/html-2.4.1.tar.bz2) = 1393522 SIZE (python/html-2.4.2.tar.bz2) = 1395537 SIZE (python/html-2.4.3.tar.bz2) = 1397233 @@ -130,18 +134,22 @@ SIZE (python264/python-2.6.4-docs-html.t SIZE (python265/python-2.6.5-docs-html.tar.bz2) = 3911804 SIZE (python266/python-2.6.6-docs-html.tar.bz2) = 3967744 SIZE (python270/python-2.7-docs-html.tar.bz2) = 4186703 +SIZE (python271/python-2.7.1-docs-html.tar.bz2) = 4229348 SIZE (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = 8589380 SIZE (python263/python-2.6.3-docs-pdf-a4.tar.bz2) = 8644689 SIZE (python264/python-2.6.4-docs-pdf-a4.tar.bz2) = 8692245 SIZE (python265/python-2.6.5-docs-pdf-a4.tar.bz2) = 8800920 SIZE (python266/python-2.6.6-docs-pdf-a4.tar.bz2) = 9100012 SIZE (python270/python-2.7-docs-pdf-a4.tar.bz2) = 9335667 +SIZE (python271/python-2.7.1-docs-pdf-a4.tar.bz2) = 9976398 SIZE (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 8626189 SIZE (python263/python-2.6.3-docs-pdf-letter.tar.bz2) = 8677602 SIZE (python264/python-2.6.4-docs-pdf-letter.tar.bz2) = 8722838 SIZE (python265/python-2.6.5-docs-pdf-letter.tar.bz2) = 8842512 SIZE (python266/python-2.6.6-docs-pdf-letter.tar.bz2) = 9152421 SIZE (python270/python-2.7-docs-pdf-letter.tar.bz2) = 9397306 +SIZE (python271/python-2.7.1-docs-pdf-letter.tar.bz2) = 10027513 SIZE (python262/python-2.6.2-docs-text.tar.bz2) = 1297095 SIZE (python266/python-2.6.6-docs-text.tar.bz2) = 1399053 SIZE (python270/pyt
