install 2to3 under python2.7-2to3 so it can co-exist with 2.6

rpointel sthen martynas ok.
This commit is contained in:
fgsch 2011-05-03 17:18:28 +00:00
parent f50c74636c
commit 0f9cb35359
4 changed files with 9 additions and 7 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2011/04/26 19:42:31 rpointel Exp $ # $OpenBSD: Makefile,v 1.3 2011/05/03 17:18:28 fgsch Exp $
VERSION = 2.7 VERSION = 2.7
PATCHLEVEL = .1 PATCHLEVEL = .1
REVISION = 0 REVISION = 1
SHARED_LIBS = python2.7 0.0 SHARED_LIBS = python2.7 0.0
AUTOCONF_VERSION = 2.65 AUTOCONF_VERSION = 2.65

View File

@ -1,5 +1,6 @@
If you want to use this package as your default system python, as root If you want to use this package as your default system python, as root
create symbolic links like so (overwriting any previous default): create symbolic links like so (overwriting any previous default):
ln -sf ${PREFIX}/bin/python2.7 ${PREFIX}/bin/python ln -sf ${PREFIX}/bin/python2.7 ${PREFIX}/bin/python
ln -sf ${PREFIX}/bin/python2.7-2to3 ${PREFIX}/bin/2to3
ln -sf ${PREFIX}/bin/python2.7-config ${PREFIX}/bin/python-config ln -sf ${PREFIX}/bin/python2.7-config ${PREFIX}/bin/python-config
ln -sf ${PREFIX}/bin/pydoc2.7 ${PREFIX}/bin/pydoc ln -sf ${PREFIX}/bin/pydoc2.7 ${PREFIX}/bin/pydoc

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2011/04/24 09:31:45 rpointel Exp $ @comment $OpenBSD: PLIST-main,v 1.2 2011/05/03 17:18:28 fgsch Exp $
@option no-default-conflict @option no-default-conflict
@conflict python->=2.7,<2.8 @conflict python->=2.7,<2.8
@conflict python-bz2->=2.7,<2.8 @conflict python-bz2->=2.7,<2.8
@ -6,11 +6,12 @@
@pkgpath lang/python/2.7,-bz2 @pkgpath lang/python/2.7,-bz2
@pkgpath lang/python/2.7,-sqlite @pkgpath lang/python/2.7,-sqlite
@pkgpath lang/python/2.7,-expat @pkgpath lang/python/2.7,-expat
bin/2to3 @comment bin/2to3
@comment bin/pydoc @comment bin/pydoc
bin/pydoc2.7 bin/pydoc2.7
@comment bin/python-config @comment bin/python-config
@bin bin/python2.7 @bin bin/python2.7
bin/python2.7-2to3
bin/python2.7-config bin/python2.7-config
include/python2.7/ include/python2.7/
include/python2.7/Python-ast.h include/python2.7/Python-ast.h

View File

@ -1,5 +1,5 @@
Don't forget to remove ${PREFIX}/bin/python, Don't forget to remove ${PREFIX}/bin/python,
${PREFIX}/bin/python-config or/and ${PREFIX}/bin/2to3, ${PREFIX}/bin/python-config and/or
${PREFIX}/bin/pydoc if they were symlinks to ${PREFIX}/bin/pydoc if they were symlinks to
${PREFIX}/bin/python2.7, ${PREFIX}/bin/python2.7-config ${PREFIX}/bin/python2.7, ${PREFIX}/bin/python2.7-2to3,
or to ${PREFIX}/bin/pydoc2.7. ${PREFIX}/bin/python2.7-config or to ${PREFIX}/bin/pydoc2.7.