pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang python: pkgsrc changes



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fca105910114
branches:  trunk
changeset: 309432:fca105910114
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Jun 17 19:21:21 2018 +0000

description:
python: pkgsrc changes

- Fix buidling curses (consistent across platforms)
- Fix finding libraries with ctypes.util.find_library
- Enable spwd module on Linux
- Cleanup

diffstat:

 lang/python27/Makefile                                          |    61 +-
 lang/python27/PLIST                                             |  4566 ++++++++++
 lang/python27/PLIST.Linux                                       |     3 +-
 lang/python27/PLIST.common                                      |  4566 ----------
 lang/python27/PLIST.common_end                                  |     2 -
 lang/python27/distinfo                                          |    27 +-
 lang/python27/patches/patch-Lib_ctypes_util.py                  |    41 +
 lang/python27/patches/patch-Lib_distutils_command_build__ext.py |    24 +
 lang/python27/patches/patch-Lib_distutils_command_install.py    |    17 +
 lang/python27/patches/patch-Lib_distutils_util.py               |    13 +
 lang/python27/patches/patch-Lib_plistlib.py                     |    15 +
 lang/python27/patches/patch-Lib_sysconfig.py                    |    15 +
 lang/python27/patches/patch-Modules_makesetup                   |    12 +
 lang/python27/patches/patch-Modules_nismodule.c                 |    15 +
 lang/python27/patches/patch-Modules_selectmodule.c              |    14 +
 lang/python27/patches/patch-Modules_sunaudiodev.c               |    43 +
 lang/python27/patches/patch-Python_thread__pthread.h            |    14 +
 lang/python27/patches/patch-ab                                  |    24 -
 lang/python27/patches/patch-ad                                  |    15 -
 lang/python27/patches/patch-ae                                  |    43 -
 lang/python27/patches/patch-al                                  |   139 -
 lang/python27/patches/patch-am                                  |   394 -
 lang/python27/patches/patch-an                                  |    12 -
 lang/python27/patches/patch-ao                                  |    13 -
 lang/python27/patches/patch-av                                  |    17 -
 lang/python27/patches/patch-aw                                  |    13 -
 lang/python27/patches/patch-ax                                  |    15 -
 lang/python27/patches/patch-az                                  |    14 -
 lang/python27/patches/patch-configure                           |   139 +
 lang/python27/patches/patch-setup.py                            |   403 +
 lang/python27/patches/patch-xa                                  |    14 -
 lang/python34/Makefile                                          |    72 +-
 lang/python34/PLIST.Linux                                       |     3 +-
 lang/python34/distinfo                                          |    17 +-
 lang/python34/patches/patch-Lib_ctypes_util.py                  |    41 +
 lang/python34/patches/patch-Lib_distutils_command_install.py    |    12 +
 lang/python34/patches/patch-Modules___cursesmodule.c            |   159 +
 lang/python34/patches/patch-Modules_makesetup                   |    15 +
 lang/python34/patches/patch-Modules_nismodule.c                 |    16 +
 lang/python34/patches/patch-Python_thread__pthread.h            |    14 +
 lang/python34/patches/patch-ah                                  |   203 -
 lang/python34/patches/patch-al                                  |   109 -
 lang/python34/patches/patch-am                                  |   130 -
 lang/python34/patches/patch-an                                  |    15 -
 lang/python34/patches/patch-av                                  |    12 -
 lang/python34/patches/patch-aw                                  |    16 -
 lang/python34/patches/patch-configure                           |   109 +
 lang/python34/patches/patch-setup.py                            |   153 +
 lang/python34/patches/patch-xa                                  |    14 -
 lang/python35/Makefile                                          |    73 +-
 lang/python35/PLIST.Linux                                       |     3 +-
 lang/python35/distinfo                                          |    11 +-
 lang/python35/patches/patch-Lib_ctypes_util.py                  |    41 +
 lang/python35/patches/patch-Modules___cursesmodule.c            |   123 +-
 lang/python35/patches/patch-configure                           |    73 +-
 lang/python35/patches/patch-pyconfig.h.in                       |    21 +-
 lang/python35/patches/patch-setup.py                            |    53 +-
 lang/python36/Makefile                                          |    74 +-
 lang/python36/PLIST.Linux                                       |     3 +-
 lang/python36/distinfo                                          |     7 +-
 lang/python36/patches/patch-Lib_ctypes_util.py                  |    16 +
 lang/python36/patches/patch-Lib_distutils_command_install.py    |     4 +-
 lang/python36/patches/patch-setup.py                            |    58 +-
 63 files changed, 6344 insertions(+), 6029 deletions(-)

diffs (truncated from 13164 to 300 lines):

diff -r 1c27e30b17b4 -r fca105910114 lang/python27/Makefile
--- a/lang/python27/Makefile    Sun Jun 17 17:13:40 2018 +0000
+++ b/lang/python27/Makefile    Sun Jun 17 19:21:21 2018 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.73 2017/11/22 19:16:20 bsiegert Exp $
+# $NetBSD: Makefile,v 1.74 2018/06/17 19:21:21 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python27-${PY_DISTVERSION}
+PKGREVISION=   1
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,14 +15,14 @@
 
 CONFLICTS+=    python-[0-9]*
 
+USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-threads
 CONFIGURE_ARGS+=       --enable-shared
-CONFIGURE_ARGS+=       OPT=${CFLAGS:Q}
+CONFIGURE_ARGS+=       --with-dbmliborder=ndbm:bdb
 CONFIGURE_ARGS+=       --with-system-ffi
-CONFIGURE_ARGS+=       --with-dbmliborder=ndbm:bdb
+CONFIGURE_ARGS+=       --with-threads
 CONFIGURE_ENV+=                MKDIR_P=${MKDIR:Q}
-
+CONFIGURE_ENV+=                OPT=${CFLAGS:Q}
 PKGCONFIG_OVERRIDE+=   Misc/python.pc.in
 
 LDFLAGS+=              -L${WRKSRC}
@@ -29,8 +30,6 @@
 # $RANDOM usage there is fine
 CHECK_PORTABILITY_SKIP=        Tools/faqwiz/move-faqwiz.sh
 
-USE_LANGUAGES=         c c++
-
 PTHREAD_OPTS+=         require
 PTHREAD_AUTO_VARS=     yes
 .include "../../mk/pthread.buildlink3.mk"
@@ -52,12 +51,6 @@
 
 PY_VER_SUFFIX=         2.7
 
-PLIST_SRC=     ${.CURDIR}/../../lang/python27/PLIST.common
-.if exists(${.CURDIR}/../../lang/python27/PLIST.${OPSYS})
-PLIST_SRC+=    ${.CURDIR}/../../lang/python27/PLIST.${OPSYS}
-.endif
-PLIST_SRC+=    ${.CURDIR}/../../lang/python27/PLIST.common_end
-
 .if ${OPSYS} == "NetBSD"
 # XXX work around a botched autoconf check which ignores libintl
 CONFIGURE_ENV+=                ac_cv_func_bind_textdomain_codeset=yes
@@ -103,7 +96,7 @@
 # For Xcode 5 we need to search the SDK path for headers, otherwise certain
 # modules will not be built.
 .if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include)
-CFLAGS+=               -I${OSX_SDK_PATH}/usr/include
+CFLAGS+=               -I${OSX_SDK_PATH:Q}/usr/include
 .endif
 
 PLIST_VARS+=   dll nis no-nis
@@ -135,8 +128,38 @@
 REPLACE_INTERPRETER+=  py27
 REPLACE.py27.old=      .*python[^ ]*
 REPLACE.py27.new=      ${PREFIX}/bin/python${PY_VER_SUFFIX}
-REPLACE_FILES.py27=    Lib/*.py Lib/*/*.py Lib/*/*/*.py
-REPLACE_FILES.py27+=   Lib/*/*/*/*.py
+REPLACE_FILES.py27=    Lib/UserString.py
+REPLACE_FILES.py27+=   Lib/base64.py
+REPLACE_FILES.py27+=   Lib/cProfile.py
+REPLACE_FILES.py27+=   Lib/cgi.py
+REPLACE_FILES.py27+=   Lib/encodings/rot_13.py
+REPLACE_FILES.py27+=   Lib/idlelib/PyShell.py
+REPLACE_FILES.py27+=   Lib/keyword.py
+REPLACE_FILES.py27+=   Lib/lib2to3/pgen2/token.py
+REPLACE_FILES.py27+=   Lib/lib2to3/tests/data/different_encoding.py
+REPLACE_FILES.py27+=   Lib/lib2to3/tests/data/false_encoding.py
+REPLACE_FILES.py27+=   Lib/lib2to3/tests/pytree_idempotency.py
+REPLACE_FILES.py27+=   Lib/mimify.py
+REPLACE_FILES.py27+=   Lib/pdb.py
+REPLACE_FILES.py27+=   Lib/plat-mac/appletrunner.py
+REPLACE_FILES.py27+=   Lib/plat-mac/bundlebuilder.py
+REPLACE_FILES.py27+=   Lib/platform.py
+REPLACE_FILES.py27+=   Lib/profile.py
+REPLACE_FILES.py27+=   Lib/pydoc.py
+REPLACE_FILES.py27+=   Lib/quopri.py
+REPLACE_FILES.py27+=   Lib/smtpd.py
+REPLACE_FILES.py27+=   Lib/smtplib.py
+REPLACE_FILES.py27+=   Lib/symbol.py
+REPLACE_FILES.py27+=   Lib/tabnanny.py
+REPLACE_FILES.py27+=   Lib/test/bisect.py
+REPLACE_FILES.py27+=   Lib/test/curses_tests.py
+REPLACE_FILES.py27+=   Lib/test/re_tests.py
+REPLACE_FILES.py27+=   Lib/test/pystone.py
+REPLACE_FILES.py27+=   Lib/test/regrtest.py
+REPLACE_FILES.py27+=   Lib/timeit.py
+REPLACE_FILES.py27+=   Lib/trace.py
+REPLACE_FILES.py27+=   Lib/uu.py
+REPLACE_FILES.py27+=   Lib/webbrowser.py
 
 SUBST_CLASSES+=                libffi
 SUBST_MESSAGE.libffi=  Fixing libffi include path on Darwin.
@@ -155,12 +178,6 @@
 # >>> from ctypes.util import find_library
 # >>> find_library("m")
 # 'libm.so.0'
-# >>> find_library("crypto")
-# 'libcrypto.so.11'
-# >>> find_library("GL")
-# 'libGL.so.2'
-# >>> find_library("curl")
-# 'libcurl.so.4'
 
 SUBST_CLASSES+=                pfindlib
 SUBST_MESSAGE.pfindlib=        Fixing find_library() on POSIX-like (excluding Darwin) systems.
diff -r 1c27e30b17b4 -r fca105910114 lang/python27/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/PLIST       Sun Jun 17 19:21:21 2018 +0000
@@ -0,0 +1,4566 @@
+@comment $NetBSD: PLIST,v 1.1 2018/06/17 19:21:21 adam Exp $
+bin/2to3-${PY_VER_SUFFIX}
+bin/pydoc${PY_VER_SUFFIX}
+bin/python${PY_VER_SUFFIX}
+bin/python${PY_VER_SUFFIX}-config
+bin/smtpd${PY_VER_SUFFIX}.py
+include/python${PY_VER_SUFFIX}/Python-ast.h
+include/python${PY_VER_SUFFIX}/Python.h
+include/python${PY_VER_SUFFIX}/abstract.h
+include/python${PY_VER_SUFFIX}/asdl.h
+include/python${PY_VER_SUFFIX}/ast.h
+include/python${PY_VER_SUFFIX}/bitset.h
+include/python${PY_VER_SUFFIX}/boolobject.h
+include/python${PY_VER_SUFFIX}/bufferobject.h
+include/python${PY_VER_SUFFIX}/bytearrayobject.h
+include/python${PY_VER_SUFFIX}/bytes_methods.h
+include/python${PY_VER_SUFFIX}/bytesobject.h
+include/python${PY_VER_SUFFIX}/cStringIO.h
+include/python${PY_VER_SUFFIX}/cellobject.h
+include/python${PY_VER_SUFFIX}/ceval.h
+include/python${PY_VER_SUFFIX}/classobject.h
+include/python${PY_VER_SUFFIX}/cobject.h
+include/python${PY_VER_SUFFIX}/code.h
+include/python${PY_VER_SUFFIX}/codecs.h
+include/python${PY_VER_SUFFIX}/compile.h
+include/python${PY_VER_SUFFIX}/complexobject.h
+include/python${PY_VER_SUFFIX}/datetime.h
+include/python${PY_VER_SUFFIX}/descrobject.h
+include/python${PY_VER_SUFFIX}/dictobject.h
+include/python${PY_VER_SUFFIX}/dtoa.h
+include/python${PY_VER_SUFFIX}/enumobject.h
+include/python${PY_VER_SUFFIX}/errcode.h
+include/python${PY_VER_SUFFIX}/eval.h
+include/python${PY_VER_SUFFIX}/fileobject.h
+include/python${PY_VER_SUFFIX}/floatobject.h
+include/python${PY_VER_SUFFIX}/frameobject.h
+include/python${PY_VER_SUFFIX}/funcobject.h
+include/python${PY_VER_SUFFIX}/genobject.h
+include/python${PY_VER_SUFFIX}/graminit.h
+include/python${PY_VER_SUFFIX}/grammar.h
+include/python${PY_VER_SUFFIX}/import.h
+include/python${PY_VER_SUFFIX}/intobject.h
+include/python${PY_VER_SUFFIX}/intrcheck.h
+include/python${PY_VER_SUFFIX}/iterobject.h
+include/python${PY_VER_SUFFIX}/listobject.h
+include/python${PY_VER_SUFFIX}/longintrepr.h
+include/python${PY_VER_SUFFIX}/longobject.h
+include/python${PY_VER_SUFFIX}/marshal.h
+include/python${PY_VER_SUFFIX}/memoryobject.h
+include/python${PY_VER_SUFFIX}/metagrammar.h
+include/python${PY_VER_SUFFIX}/methodobject.h
+include/python${PY_VER_SUFFIX}/modsupport.h
+include/python${PY_VER_SUFFIX}/moduleobject.h
+include/python${PY_VER_SUFFIX}/node.h
+include/python${PY_VER_SUFFIX}/object.h
+include/python${PY_VER_SUFFIX}/objimpl.h
+include/python${PY_VER_SUFFIX}/opcode.h
+include/python${PY_VER_SUFFIX}/osdefs.h
+include/python${PY_VER_SUFFIX}/parsetok.h
+include/python${PY_VER_SUFFIX}/patchlevel.h
+include/python${PY_VER_SUFFIX}/pgen.h
+include/python${PY_VER_SUFFIX}/pgenheaders.h
+include/python${PY_VER_SUFFIX}/py_curses.h
+include/python${PY_VER_SUFFIX}/pyarena.h
+include/python${PY_VER_SUFFIX}/pycapsule.h
+include/python${PY_VER_SUFFIX}/pyconfig.h
+include/python${PY_VER_SUFFIX}/pyctype.h
+include/python${PY_VER_SUFFIX}/pydebug.h
+include/python${PY_VER_SUFFIX}/pyerrors.h
+include/python${PY_VER_SUFFIX}/pyexpat.h
+include/python${PY_VER_SUFFIX}/pyfpe.h
+include/python${PY_VER_SUFFIX}/pygetopt.h
+include/python${PY_VER_SUFFIX}/pymacconfig.h
+include/python${PY_VER_SUFFIX}/pymactoolbox.h
+include/python${PY_VER_SUFFIX}/pymath.h
+include/python${PY_VER_SUFFIX}/pymem.h
+include/python${PY_VER_SUFFIX}/pyport.h
+include/python${PY_VER_SUFFIX}/pystate.h
+include/python${PY_VER_SUFFIX}/pystrcmp.h
+include/python${PY_VER_SUFFIX}/pystrtod.h
+include/python${PY_VER_SUFFIX}/pythonrun.h
+include/python${PY_VER_SUFFIX}/pythread.h
+include/python${PY_VER_SUFFIX}/rangeobject.h
+include/python${PY_VER_SUFFIX}/setobject.h
+include/python${PY_VER_SUFFIX}/sliceobject.h
+include/python${PY_VER_SUFFIX}/stringobject.h
+include/python${PY_VER_SUFFIX}/structmember.h
+include/python${PY_VER_SUFFIX}/structseq.h
+include/python${PY_VER_SUFFIX}/symtable.h
+include/python${PY_VER_SUFFIX}/sysmodule.h
+include/python${PY_VER_SUFFIX}/timefuncs.h
+include/python${PY_VER_SUFFIX}/token.h
+include/python${PY_VER_SUFFIX}/traceback.h
+include/python${PY_VER_SUFFIX}/tupleobject.h
+include/python${PY_VER_SUFFIX}/ucnhash.h
+include/python${PY_VER_SUFFIX}/unicodeobject.h
+include/python${PY_VER_SUFFIX}/warnings.h
+include/python${PY_VER_SUFFIX}/weakrefobject.h
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so.1.0
+lib/pkgconfig/python-${PY_VER_SUFFIX}.pc
+lib/python${PY_VER_SUFFIX}/BaseHTTPServer.py
+lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyc
+lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyo
+lib/python${PY_VER_SUFFIX}/Bastion.py
+lib/python${PY_VER_SUFFIX}/Bastion.pyc
+lib/python${PY_VER_SUFFIX}/Bastion.pyo
+lib/python${PY_VER_SUFFIX}/CGIHTTPServer.py
+lib/python${PY_VER_SUFFIX}/CGIHTTPServer.pyc
+lib/python${PY_VER_SUFFIX}/CGIHTTPServer.pyo
+lib/python${PY_VER_SUFFIX}/ConfigParser.py
+lib/python${PY_VER_SUFFIX}/ConfigParser.pyc
+lib/python${PY_VER_SUFFIX}/ConfigParser.pyo
+lib/python${PY_VER_SUFFIX}/Cookie.py
+lib/python${PY_VER_SUFFIX}/Cookie.pyc
+lib/python${PY_VER_SUFFIX}/Cookie.pyo
+lib/python${PY_VER_SUFFIX}/DocXMLRPCServer.py
+lib/python${PY_VER_SUFFIX}/DocXMLRPCServer.pyc
+lib/python${PY_VER_SUFFIX}/DocXMLRPCServer.pyo
+lib/python${PY_VER_SUFFIX}/HTMLParser.py
+lib/python${PY_VER_SUFFIX}/HTMLParser.pyc
+lib/python${PY_VER_SUFFIX}/HTMLParser.pyo
+lib/python${PY_VER_SUFFIX}/LICENSE.txt
+lib/python${PY_VER_SUFFIX}/MimeWriter.py
+lib/python${PY_VER_SUFFIX}/MimeWriter.pyc
+lib/python${PY_VER_SUFFIX}/MimeWriter.pyo
+lib/python${PY_VER_SUFFIX}/Queue.py
+lib/python${PY_VER_SUFFIX}/Queue.pyc
+lib/python${PY_VER_SUFFIX}/Queue.pyo
+lib/python${PY_VER_SUFFIX}/SimpleHTTPServer.py
+lib/python${PY_VER_SUFFIX}/SimpleHTTPServer.pyc
+lib/python${PY_VER_SUFFIX}/SimpleHTTPServer.pyo
+lib/python${PY_VER_SUFFIX}/SimpleXMLRPCServer.py
+lib/python${PY_VER_SUFFIX}/SimpleXMLRPCServer.pyc
+lib/python${PY_VER_SUFFIX}/SimpleXMLRPCServer.pyo
+lib/python${PY_VER_SUFFIX}/SocketServer.py
+lib/python${PY_VER_SUFFIX}/SocketServer.pyc
+lib/python${PY_VER_SUFFIX}/SocketServer.pyo
+lib/python${PY_VER_SUFFIX}/StringIO.py
+lib/python${PY_VER_SUFFIX}/StringIO.pyc
+lib/python${PY_VER_SUFFIX}/StringIO.pyo
+lib/python${PY_VER_SUFFIX}/UserDict.py
+lib/python${PY_VER_SUFFIX}/UserDict.pyc
+lib/python${PY_VER_SUFFIX}/UserDict.pyo
+lib/python${PY_VER_SUFFIX}/UserList.py
+lib/python${PY_VER_SUFFIX}/UserList.pyc
+lib/python${PY_VER_SUFFIX}/UserList.pyo
+lib/python${PY_VER_SUFFIX}/UserString.py
+lib/python${PY_VER_SUFFIX}/UserString.pyc
+lib/python${PY_VER_SUFFIX}/UserString.pyo
+lib/python${PY_VER_SUFFIX}/_LWPCookieJar.py
+lib/python${PY_VER_SUFFIX}/_LWPCookieJar.pyc
+lib/python${PY_VER_SUFFIX}/_LWPCookieJar.pyo
+lib/python${PY_VER_SUFFIX}/_MozillaCookieJar.py
+lib/python${PY_VER_SUFFIX}/_MozillaCookieJar.pyc
+lib/python${PY_VER_SUFFIX}/_MozillaCookieJar.pyo
+lib/python${PY_VER_SUFFIX}/__future__.py
+lib/python${PY_VER_SUFFIX}/__future__.pyc
+lib/python${PY_VER_SUFFIX}/__future__.pyo
+lib/python${PY_VER_SUFFIX}/__phello__.foo.py
+lib/python${PY_VER_SUFFIX}/__phello__.foo.pyc
+lib/python${PY_VER_SUFFIX}/__phello__.foo.pyo
+lib/python${PY_VER_SUFFIX}/_abcoll.py
+lib/python${PY_VER_SUFFIX}/_abcoll.pyc
+lib/python${PY_VER_SUFFIX}/_abcoll.pyo
+lib/python${PY_VER_SUFFIX}/_osx_support.py
+lib/python${PY_VER_SUFFIX}/_osx_support.pyc
+lib/python${PY_VER_SUFFIX}/_osx_support.pyo
+lib/python${PY_VER_SUFFIX}/_pyio.py
+lib/python${PY_VER_SUFFIX}/_pyio.pyc
+lib/python${PY_VER_SUFFIX}/_pyio.pyo
+lib/python${PY_VER_SUFFIX}/_strptime.py
+lib/python${PY_VER_SUFFIX}/_strptime.pyc
+lib/python${PY_VER_SUFFIX}/_strptime.pyo
+lib/python${PY_VER_SUFFIX}/_sysconfigdata.py
+lib/python${PY_VER_SUFFIX}/_sysconfigdata.pyc
+lib/python${PY_VER_SUFFIX}/_sysconfigdata.pyo
+lib/python${PY_VER_SUFFIX}/_threading_local.py



Home | Main Index | Thread Index | Old Index