diff options
author | drochner <drochner> | 2010-09-06 17:33:57 +0000 |
---|---|---|
committer | drochner <drochner> | 2010-09-06 17:33:57 +0000 |
commit | aedb9e5c8c1158bffd594a308c98cd94a98d21c3 (patch) | |
tree | 0b550eef3bc60aa35b2c7db9c7efbd50d84be7e1 /lang/python26 | |
parent | cd4fe007191f93ec73ba0171abddbec10ac56acf (diff) | |
download | pkgsrc-aedb9e5c8c1158bffd594a308c98cd94a98d21c3.tar.gz |
-add workaround for bind_textdomain_codeset()-problem like in python25
-disable build of *audiodev and spwd to avoid complexity -- if needed
these can be added as seperate pkgs
ride on recent update
Diffstat (limited to 'lang/python26')
-rw-r--r-- | lang/python26/Makefile | 12 | ||||
-rw-r--r-- | lang/python26/PLIST.Linux | 4 | ||||
-rw-r--r-- | lang/python26/PLIST.SunOS | 4 | ||||
-rw-r--r-- | lang/python26/PLIST.common | 3 | ||||
-rw-r--r-- | lang/python26/distinfo | 4 | ||||
-rw-r--r-- | lang/python26/patches/patch-am | 13 |
6 files changed, 18 insertions, 22 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index b9666533130..1524d24a275 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2010/09/04 05:12:00 obache Exp $ +# $NetBSD: Makefile,v 1.26 2010/09/06 17:33:57 drochner Exp $ DISTNAME= Python-2.6.6 PKGNAME= ${DISTNAME:S/Python/python26/} @@ -51,6 +51,8 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python26/PLIST.common_end .if ${OPSYS} == "NetBSD" PRIVILEGED_STAGES+= clean +# XXX work around a botched autoconf check which ignores libintl +CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes .endif .if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" @@ -97,13 +99,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 @@ -173,5 +168,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" diff --git a/lang/python26/PLIST.Linux b/lang/python26/PLIST.Linux index 779772f9db1..6ccb4e7eea5 100644 --- a/lang/python26/PLIST.Linux +++ b/lang/python26/PLIST.Linux @@ -1,6 +1,4 @@ -@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2009/04/19 14:42:48 wiz 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/06 17:33:57 drochner 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 diff --git a/lang/python26/PLIST.SunOS b/lang/python26/PLIST.SunOS index b8607fb1b4d..2f6809581a4 100644 --- a/lang/python26/PLIST.SunOS +++ b/lang/python26/PLIST.SunOS @@ -1,6 +1,4 @@ -@comment $NetBSD: PLIST.SunOS,v 1.1.1.1 2009/04/19 14:42:48 wiz 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/06 17:33:57 drochner 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 diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common index 52022e13069..4e50179a505 100644 --- a/lang/python26/PLIST.common +++ b/lang/python26/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.11 2010/09/04 05:12:00 obache Exp $ +@comment $NetBSD: PLIST.common,v 1.12 2010/09/06 17:33:57 drochner Exp $ bin/2to3 bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1738,7 +1738,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 diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 1619178d19e..e9c913aef28 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2010/09/04 05:12:00 obache Exp $ +$NetBSD: distinfo,v 1.24 2010/09/06 17:33:57 drochner Exp $ SHA1 (Python-2.6.6.tar.bz2) = a1daf2c2c7cffe0939c015260447572fe75c7e50 RMD160 (Python-2.6.6.tar.bz2) = 2d63f4f0ad3c124a8e62215ca94bd0231350e912 @@ -10,7 +10,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 SHA1 (patch-al) = e5bf2a7f50534a18bb18f7111b3c5d097b528778 -SHA1 (patch-am) = d16a765ef8dfdf78d3208016d4300dad170a6cf2 +SHA1 (patch-am) = dba7ed14af2676c8563068c9b053e26a56f312d1 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am index 0fcdc658e3f..e4ca6b40dfe 100644 --- a/lang/python26/patches/patch-am +++ b/lang/python26/patches/patch-am @@ -1,11 +1,18 @@ -$NetBSD: patch-am,v 1.12 2010/09/04 05:12:00 obache Exp $ +$NetBSD: patch-am,v 1.13 2010/09/06 17:33:57 drochner Exp $ Disabled modules for normal build: bsdddb curses curses_panel elementtree -Those have separate packages. +sqlite3 +tkinter +gdbm +pyexpat +readline +{linux,oss,sun}audiodev +spwb +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 |