kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Catch up to last python26 update with additional fixes.

Browse source
This commit is contained in:
OBATA Akio 2010-09-15 12:50:46 +00:00 committed by Thomas Klausner
parent 4777fcb110
commit b17ca44921
7 changed files with 24 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
python27/MESSAGE.SunOS
View file

@ -1,8 +0,0 @@
===========================================================================
$NetBSD: MESSAGE.SunOS,v 1.1.1.1 2010/03/17 13:09:05 obache Exp $
In order for the Python installation to successfuly compile the
"sunaudiodev" module you must install the SUNWaudh package to have
the necessary headers installed.
===========================================================================

24
python27/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2010/09/15 08:44:48 obache Exp $
# $NetBSD: Makefile,v 1.6 2010/09/15 12:50:46 obache Exp $
DISTNAME= Python-2.7
PKGNAME= ${DISTNAME:S/Python/python27/}
@ -52,6 +52,8 @@ PLIST_SRC+= ${.CURDIR}/../../wip/python27/PLIST.common_end
.if ${OPSYS} == "NetBSD"
PRIVILEGED_STAGES+= clean
# XXX work around a botched autoconf check whiche ignores libintl
CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes
.endif
.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
@ -98,13 +100,6 @@ PLIST_VARS+= extra-so
PLIST.extra-so= yes
.endif
# ossaudiodev is only available on x86 for the following platforms
PLIST_VARS+= oss
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
(${PY_PLATNAME} == "linux2" || ${OPSYS} == "FreeBSD")
PLIST.oss= yes
.endif
# Make sure python modules can link correctly
.if ${OPSYS} == "Darwin"
INSTALL_UNSTRIPPED= yes
@ -152,12 +147,12 @@ PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
TEST_TARGET= test
INSTALL_TARGET= altinstall
REPLACE_INTERPRETER+= py26
REPLACE.py26.old= .*python[^ ]*
REPLACE.py26.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
REPLACE_FILES.py26= Lib/cgi.py # explicitly demanded to be patched
REPLACE_FILES.py26+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py
REPLACE_FILES.py26+= Lib/test/test_largefile.py Lib/test/test_optparse.py
REPLACE_INTERPRETER+= py27
REPLACE.py27.old= .*python[^ ]*
REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
REPLACE_FILES.py27= Lib/cgi.py # explicitly demanded to be patched
REPLACE_FILES.py27+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py
REPLACE_FILES.py27+= Lib/test/test_largefile.py Lib/test/test_optparse.py
post-extract:
${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
@ -180,5 +175,4 @@ BUILDLINK_DEPMETHOD.readline= build
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

4
python27/PLIST.Linux
View file

@ -1,6 +1,4 @@
@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2010/03/17 13:09:05 obache Exp $
lib/python${PY_VER_SUFFIX}/lib-dynload/linuxaudiodev.so
lib/python${PY_VER_SUFFIX}/lib-dynload/spwd.so
@comment $NetBSD: PLIST.Linux,v 1.2 2010/09/15 12:50:46 obache Exp $
lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.py
lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyc
lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyo

4
python27/PLIST.SunOS
View file

@ -1,6 +1,4 @@
@comment $NetBSD: PLIST.SunOS,v 1.1.1.1 2010/03/17 13:09:05 obache Exp $
lib/python${PY_VER_SUFFIX}/lib-dynload/sunaudiodev.so
lib/python${PY_VER_SUFFIX}/lib-dynload/spwd.so
@comment $NetBSD: PLIST.SunOS,v 1.2 2010/09/15 12:50:46 obache Exp $
lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDIO.py
lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDIO.pyc
lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDIO.pyo

3
python27/PLIST.common
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.3 2010/09/15 08:44:48 obache Exp $
@comment $NetBSD: PLIST.common,v 1.4 2010/09/15 12:50:46 obache Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@ -1839,7 +1839,6 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
lib/python${PY_VER_SUFFIX}/lib-dynload/select.so

4
python27/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.5 2010/09/15 08:44:48 obache Exp $
$NetBSD: distinfo,v 1.6 2010/09/15 12:50:46 obache Exp $
SHA1 (Python-2.7.tar.bz2) = 6bbcd1ab16d07765a7a405671e1e43a2e74b8e6a
RMD160 (Python-2.7.tar.bz2) = e89957d8e76127fd4a86fd733deed1c0ad1248df
@ -9,7 +9,7 @@ SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
SHA1 (patch-al) = 1555582ccb83b962ef879b6cce685f16206f7237
SHA1 (patch-am) = b9df2df498022a6d45d2f7423f6df1123d6e036e
SHA1 (patch-am) = 6d8c54dd259f594c594755f22e16d04c70f5be99
SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
SHA1 (patch-ao) = fe40fbf26bca823daab46e0fec16bd3d0b18e26b
SHA1 (patch-ap) = 59b3f974a98d9cf972765662729de67652e0bbbb

13
python27/patches/patch-am
View file

@ -1,11 +1,18 @@
$NetBSD: patch-am,v 1.4 2010/09/15 08:44:48 obache Exp $
$NetBSD: patch-am,v 1.5 2010/09/15 12:50:47 obache Exp $
Disabled modules for normal build:
bsdddb
curses
curses_panel
elementtree
Those have separate packages.
sqlite3
tkinter
gdbm
pyexpat
readline
{linux,oss,sun}audiodev
spwd
Those have separate packages where needed.
Only check the BUILDLINK_DIR for libraries etc, do not pick up random
headers and libraries from the system.
@ -19,7 +26,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline"]
+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"]
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if