Commit Graph

67 Commits

Author SHA1 Message Date
ajacoutot 31714330cd Bump the default python3 version to 3.3.
Successfully tested with gnome which is the biggest consumer of py3 -- any
regression, please let me know.

discussed with fgsch@ rpointel@ sthen@ jasper@ landry@ zhuk@
2013-05-30 13:08:59 +00:00
fgsch f2b172b030 make _MODPY_CMD external (remove underscore).
sthen@ ok
2013-05-13 19:06:45 +00:00
ajacoutot 091f0bba3b Since we can override MODPY_VERSION, no need to override
MODPY_DEFAULT_VERSION_3 as well.

ok fgsch@
2013-05-10 06:07:53 +00:00
fgsch 88d0fdad29 allow to override the default python 3 version.
needed by and ok ajacoutot@
2013-05-03 08:51:05 +00:00
sthen 114602ef6e revert last MODPY_PY_PREFIX change in SUBST_VARS, it prevents update-plist from
replacing share/doc/py-something with share/doc/${MODPY_PY_PREFIX}-something.
requested by fgsch@
2013-04-30 17:20:58 +00:00
fgsch 9da5564087 Handle upcoming 3.3 directory 2013-04-28 01:00:33 +00:00
sthen 378e074c6d use ^ before MODPY_PREFIX in SUBST_VARS to reduce bogus subst's (this is
only used by "make plist" and doesn't chnage packages). ok fgsch rpointel aja
2013-04-04 12:36:43 +00:00
fgsch d63ebc46ea expose _MODPY_BIN_ADJ (remove underscore) 2013-04-01 16:49:53 +00:00
espie 0662a4e9d6 PERMIT_* / REGRESS->TEST sweep 2013-03-11 11:20:26 +00:00
sthen f5a323c546 Don't use ${FLAVOR:L}, we only support lower-case flavours now.
OK ajacoutot@ espie@
2013-02-09 14:49:50 +00:00
fgsch 5401d8078b - expose _MODPY_MAJOR_VERSION (remove underscore)
- use :R to extract the major
- remove unneeded check

rpointel@ ok. while here add some spaces for consistency with the rest of
the file.
2012-12-21 18:19:38 +00:00
rpointel 1305786da7 remade the MODPY_DEFAULT_VERSION_2 and MODPY_DEFAULT_VERSION_3 external variables,
used in few ports...
spotted by jasper@ and Alexandr Shadchin.
2012-10-14 17:26:12 +00:00
rpointel 32dc0089f4 begin to clean python.port.mk by making these variables internal:
_MODPY_DEFAULT_VERSION_2
_MODPY_DEFAULT_VERSION_3
_MODPY_PRE_BUILD_STEPS
_MODPY_BIN_ADJ
ok sthen@ reads good espie@.
2012-10-12 19:57:46 +00:00
espie 6857535880 consistent style
okay rpointel@
2012-08-28 19:10:45 +00:00
rpointel 9f5c81ba5f needed for the python 3.2.3 update (to understand the splendid pep3147...)
ok landry@.
2012-06-27 18:56:26 +00:00
ajacoutot ddd9aa6a1c Add ac_cv_prog_PYTHON in CONFIGURE_ENV. This is needed because sometimes
configure scripts look for hardcoded version of python without taking
into consideration the PYTHON variable we already export.

ok fgsch@
2012-04-03 09:21:42 +00:00
ajacoutot 258288151f Only set SHARED_ONLY if python is needed at build and/or run time and
not just when we use the python MODULE.

ok rpointel@ fgsch@
2012-03-31 08:53:57 +00:00
fgsch 7cf02618d6 RIP python2.4.
jasper@ ok
2011-12-20 13:08:06 +00:00
rpointel 650dd13bbf Permit to build Python 2 and Python 3 ports.
ok fgsch@.
2011-12-14 20:31:28 +00:00
pascal a8274ecebc Fix MODPY_INCDIR with python3.
ok rpointel@
2011-11-29 17:29:37 +00:00
espie 009a1a9376 avoid weird error message if something defines MODPY_VERSION to a bad value,
by making sure we're a valid value before we try a numerical test.
2011-10-17 13:55:24 +00:00
fgsch df0099aa3e handle py3-distribute requirement correctly.
sthen@ rpointel@ ok.
2011-10-03 13:54:12 +00:00
sthen 119b2307f8 let Python use PKGSPEC infrastructure, discussed with and variable name
suggestion from fgsch@
2011-09-27 21:27:36 +00:00
sthen 1506610460 reinstate MODPYSPEC and restore MODPY_RUN_DEPENDS to previous
same diff/ok fgsch@
2011-09-22 09:44:40 +00:00
fgsch f07def33ab Merge in support for python3.
remi@ sthen@ ok
2011-09-21 14:37:28 +00:00
rpointel f280fddcc0 Switch default to python 2.7.
Discussed and ok from many. Bumps will follow.
"go go go" from jasper@.
2011-06-08 17:28:14 +00:00
rpointel c25fe689b1 Prepare import of python 2.7.
(Not linked to the build, and not made the default python).
ok landry@, fgsch@.
2011-04-24 09:19:01 +00:00
espie 88d20077a4 new depends 2010-11-17 08:05:12 +00:00
ajacoutot 39407c46c2 Add a MODPY_BIN_ADJ variable for python shebang substitution. It will
automatically change from scripts from using /usr/bin/env python or
/usr/bin/python to using #!${MODPY_BIN} .
Add a MODPY_ADJ_FILES in which you can put the files that are under
${WRKSRC} you want to subtitute the shebang.
e.g.
MODPY_ADJ_FILES= setup.py bin/foobar.py.in


Some input from djm@
"sane idea to me" jasper, ok sthen@
2010-10-26 14:29:26 +00:00
sthen 3b2bbaacc0 Add MODPY_WANTLIB, adjust MODPY_LIB_DEPENDS to new-style LIB_DEPENDS,
update all ports to match. Plists don't change -> no bump.
Looks ok to jasper.
2010-10-24 15:53:55 +00:00
fgsch 64401fc28c - Add a MODPY_JSON var soon to be used by ports requiring simplejson when
built with python versions previous to 2.6.
- Simplify MODPY_BADEGGS.
- Fake setuptools if MODPY_SETUPTOOLS is not present to detect those ports
  that will build regardless but the resulting plist will be different.
Input, tested and ok by many, thanks!
2010-09-16 22:58:19 +00:00
fgsch 7306c4d463 Switch default to python 2.6.
Discussed and ok from many. Bumps will follow.
2010-08-30 16:35:02 +00:00
djm 1b319614a9 revert previous; hppa is sick and needs to be fixed first 2010-07-29 08:39:53 +00:00
djm fcc3b09a49 Move to python-2.6 by default; requested by fgsch@ 2010-07-29 02:17:58 +00:00
ajacoutot 5f48a04970 Add a MODPY_BUILDDEP variable so we can use the python MODULE without
actually needing python. This will allow removal of some hacks in tree.
Remove XXX.

ok sthen@
2010-07-22 10:39:19 +00:00
sthen 02435810cc update the list of ports which hardcode the python version
(subversion and pinot, as well as gtk+2 which is already listed).
2010-07-15 07:55:29 +00:00
espie d6818103c8 the egg framework is fucked up (modifies stuff in WRKBUILD during install),
so work around by tricking it to write into WRKINST through a symlink.

keep this here, so that affected ports need minimal modifications, and we
can work out a better fix long term.

Agreed with wcmaier...
2010-02-27 17:52:18 +00:00
sthen 43295534c2 Add a comment noting that x11/gtk+2 hardcodes the python version;
ajacoutot@ agrees with doing it this way.
2009-08-08 21:58:10 +00:00
ajacoutot 22e9ba6d0d Add CONFIGURE_ENV += PYTHON="${MODPY_BIN}"
Lots of python ports already do this, so better factorize. It will also
help mitigate some build breakages when several python versions are
installed.

Related ports cleanup coming in a few...

"looks ok" wcmaier@
"makes sense" sthen@
"no objection"  djm@
2009-04-26 10:49:33 +00:00
espie 4a3813916a A few more python deps, tweak python module to handle tkinter 2009-03-15 13:03:41 +00:00
espie f4e4ac6742 a few spec fixes and assorted pkg bumps, more to come. 2009-03-09 23:09:19 +00:00
djm d71b9a7269 Updates and garbage collect all three Python ports:
2.4.4 => 2.4.8
    2.5.2 => 2.5.4
    2.6 => 2.6.1

Python 2.4 and 2.5 lose their build knobs to match 2.6.

Removes no longer needed Python 2.5 security patches backported
from the release25-maint SVN branch.

Remove the -bz2 subpackage from all three versions. It is silly
to make a subpackage to avoid depending on something tiny and
compatibly licensed.

Python 2.4 and 2.5 lose their -expat subpackages; expat has been
in base for some time.

Python 2.5 loses its sqlite subpackge. Again, sqlite is tiny,
compatibly licensed and is depended upon by more and more
applications. This brings it into line with the 2.6 version.

Rework all three version's handling of setup.py. Rather than regex
replacing LOCALBASE and X11BASE into setup.py post-configure, these
are passed in though environment variables. Will save hours of
frustrated cursing familiar to anyone who has accidently used the
update-patches target after configure and had to go back and redo
all the substitutions.

Rework the patching of setup.py for 2.4 and 2.5 to be more like
what we do for 2.6. I.e. keep the diff minimal and avoid deleting
huge blocks of code, so the diff has a chance of applying without
massive hand-editing each patch release.

Fix .py paths in installed .pyc files (patch from eric@)

feedback from several, particularly eric@, ajacoutot@ and Ingo
Schwarze; "get it in" ajacoutot@
2009-01-01 21:03:27 +00:00
fgsch 95bf280eb6 No expat dependency for 2.6. djm@ ok. 2008-12-16 06:32:27 +00:00
ajacoutot 3b716fff98 - add MODPY_BIN to SUBST_VARS
"+1" wcmaier_p, "yes please" steven@, "remove python" mbalmer@
2008-10-27 00:02:27 +00:00
wcmaier 1dc7873634 Prepend MODPY_* variables in SUBST_VARS.
Previously, when eg MODPY_VERSION is a substring of a variable added
to SUBST_VARS in a port's Makefile, pain on update-plist can ensue.
Makes updates on www/py-django more fun. Tests and feedback from
merdely@ and Darrin Chandler; thanks!

ok steven@, "if it doesn't break anything..." fgsch@
2008-06-10 15:01:49 +00:00
wcmaier 8d2dde4d44 Add MODPY_EGG_VERSION to SUBST_VARS to make PLIST updates nicer.
This'll prevent setuptools from creating egg-info filenames
encoded with the package version (even when MODPY_SETUPTOOLS
isn't enabled).

ok mbalmer@, eric@, merdely@; input from many py porters
2008-04-09 21:45:54 +00:00
ajacoutot a33dce6a1a - set SHARED_ONLY=Yes for this module
mbalmer: "python is only runnable on shared arches, all extensions use dlopen()"
no objections from jasper@ espie@ mbalmer@
2008-01-20 15:28:29 +00:00
martynas 486155ce21 add lang/python category; ok steven@ ajacoutot@ 2007-12-10 21:06:58 +00:00
steven 94f22279a1 replace MODPY_NO_RUNDEP with MODPY_RUNDEP (yes by default)
add MODPY_LIB_DEPENDS

no objection djm@, ok bernd@
2007-10-22 10:14:02 +00:00
steven 1c3b4e374e oops, missing :L 2007-10-10 21:44:06 +00:00