Received: by mail.netbsd.org (Postfix, from userid 605) id F1AC084D8A; Fri, 9 Feb 2018 08:04:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7E1E684D68 for ; Fri, 9 Feb 2018 08:04:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id F_Na__7XStW5 for ; Fri, 9 Feb 2018 08:04:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C301784CEF for ; Fri, 9 Feb 2018 08:04:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C09A6FB40; Fri, 9 Feb 2018 08:04:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1518163481200770" MIME-Version: 1.0 Date: Fri, 9 Feb 2018 08:04:41 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/lang/py-cxfreeze To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180209080441.C09A6FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1518163481200770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: adam Date: Fri Feb 9 08:04:41 UTC 2018 Modified Files: pkgsrc/lang/py-cxfreeze: Makefile PLIST distinfo Added Files: pkgsrc/lang/py-cxfreeze/patches: patch-setup.py Removed Files: pkgsrc/lang/py-cxfreeze/patches: patch-aa Log Message: py-cxfreeze: updated to 5.1.1 Version 5.1.1: Correct code used to identify the directory in which the library and its zip file are located. Ensure that the pythoncom and pywintypes DLLs are found in the lib directory, not in the base directory. Copy dependent files to the same directory as the file it depends on, not the root directory; also add a sample for PyQt5 to demonstrate its correct use. Version 5.1: Use fixed library location on all platforms; should correct the error “no module named __startup__”. Correct sqlite3 hook for use in Python 2.7. Correct usage of scipy.lib. Correct handling of __path__ attribute in module. Fix gevent bug 42. Droppped support for Python 3.4. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/py-cxfreeze/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/py-cxfreeze/PLIST cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/py-cxfreeze/distinfo cvs rdiff -u -r1.5 -r0 pkgsrc/lang/py-cxfreeze/patches/patch-aa cvs rdiff -u -r0 -r1.1 pkgsrc/lang/py-cxfreeze/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1518163481200770 Content-Disposition: inline Content-Length: 5751 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/py-cxfreeze/Makefile diff -u pkgsrc/lang/py-cxfreeze/Makefile:1.10 pkgsrc/lang/py-cxfreeze/Makefile:1.11 --- pkgsrc/lang/py-cxfreeze/Makefile:1.10 Wed Dec 27 23:32:37 2017 +++ pkgsrc/lang/py-cxfreeze/Makefile Fri Feb 9 08:04:41 2018 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2017/12/27 23:32:37 he Exp $ +# $NetBSD: Makefile,v 1.11 2018/02/09 08:04:41 adam Exp $ -DISTNAME= cx_Freeze-5.0.2 +DISTNAME= cx_Freeze-5.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_F/f/} -PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=c/cx_Freeze/} @@ -11,11 +10,12 @@ HOMEPAGE= http://cx-freeze.sourceforge.n COMMENT= Freezing python scripts into executables LICENSE= python-software-foundation -USE_LANGUAGES= c c++ +REPLACE_PYTHON= cx_Freeze/samples/PyQt5/PyQt5app.py post-extract: ${MV} ${WRKSRC}/cxfreeze ${WRKSRC}/cxfreeze${PYVERSSUFFIX} ${MV} ${WRKSRC}/cxfreeze-quickstart ${WRKSRC}/cxfreeze-quickstart${PYVERSSUFFIX} +.include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/py-cxfreeze/PLIST diff -u pkgsrc/lang/py-cxfreeze/PLIST:1.5 pkgsrc/lang/py-cxfreeze/PLIST:1.6 --- pkgsrc/lang/py-cxfreeze/PLIST:1.5 Sat Sep 30 13:44:35 2017 +++ pkgsrc/lang/py-cxfreeze/PLIST Fri Feb 9 08:04:41 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2017/09/30 13:44:35 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2018/02/09 08:04:41 adam Exp $ bin/cxfreeze${PYVERSSUFFIX} bin/cxfreeze-quickstart${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO @@ -51,6 +51,12 @@ ${PYSITELIB}/cx_Freeze/samples/PyQt4/PyQ ${PYSITELIB}/cx_Freeze/samples/PyQt4/setup.py ${PYSITELIB}/cx_Freeze/samples/PyQt4/setup.pyc ${PYSITELIB}/cx_Freeze/samples/PyQt4/setup.pyo +${PYSITELIB}/cx_Freeze/samples/PyQt5/PyQt5app.py +${PYSITELIB}/cx_Freeze/samples/PyQt5/PyQt5app.pyc +${PYSITELIB}/cx_Freeze/samples/PyQt5/PyQt5app.pyo +${PYSITELIB}/cx_Freeze/samples/PyQt5/setup.py +${PYSITELIB}/cx_Freeze/samples/PyQt5/setup.pyc +${PYSITELIB}/cx_Freeze/samples/PyQt5/setup.pyo ${PYSITELIB}/cx_Freeze/samples/Tkinter/SimpleTkApp.py ${PYSITELIB}/cx_Freeze/samples/Tkinter/SimpleTkApp.pyc ${PYSITELIB}/cx_Freeze/samples/Tkinter/SimpleTkApp.pyo Index: pkgsrc/lang/py-cxfreeze/distinfo diff -u pkgsrc/lang/py-cxfreeze/distinfo:1.8 pkgsrc/lang/py-cxfreeze/distinfo:1.9 --- pkgsrc/lang/py-cxfreeze/distinfo:1.8 Wed Dec 27 23:32:37 2017 +++ pkgsrc/lang/py-cxfreeze/distinfo Fri Feb 9 08:04:41 2018 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2017/12/27 23:32:37 he Exp $ +$NetBSD: distinfo,v 1.9 2018/02/09 08:04:41 adam Exp $ -SHA1 (cx_Freeze-5.0.2.tar.gz) = 3457e63a966c2c0bae179a7bb869b9b6226d9ef0 -RMD160 (cx_Freeze-5.0.2.tar.gz) = bf969fb2ad526aa15d5be90d0875bd5d51fd3ce8 -SHA512 (cx_Freeze-5.0.2.tar.gz) = eac1a5cfd5b73f43a9447f3fce8a6ba513e253da10f44a74e4fbcd5b83068a57316e215aa03acac6807dee235e6f690b4bbba1447667bb2cba33b1182cb87d29 -Size (cx_Freeze-5.0.2.tar.gz) = 60104 bytes -SHA1 (patch-aa) = fa5613b9efb7a6a73618c4513f27d2b2f9b73857 +SHA1 (cx_Freeze-5.1.1.tar.gz) = de10355fcbce9eddc06ece2b1afd392ce09914e2 +RMD160 (cx_Freeze-5.1.1.tar.gz) = 554ca12a2fad62e36aee78456c326403812226f7 +SHA512 (cx_Freeze-5.1.1.tar.gz) = 64f9c3b7f6c3003c1dc439fc2da7d0c13c5f146834e3ab8ece3921f1eb30c6e3eda480ccc84e61cc061597521b360cf8f5ef8e0bbcce1437157360c3d9c1adbc +Size (cx_Freeze-5.1.1.tar.gz) = 61381 bytes +SHA1 (patch-setup.py) = fa5613b9efb7a6a73618c4513f27d2b2f9b73857 Added files: Index: pkgsrc/lang/py-cxfreeze/patches/patch-setup.py diff -u /dev/null pkgsrc/lang/py-cxfreeze/patches/patch-setup.py:1.1 --- /dev/null Fri Feb 9 08:04:41 2018 +++ pkgsrc/lang/py-cxfreeze/patches/patch-setup.py Fri Feb 9 08:04:41 2018 @@ -0,0 +1,49 @@ +$NetBSD: patch-setup.py,v 1.1 2018/02/09 08:04:41 adam Exp $ + +Link with proper run-time library path, +link with -lpthread on NetBSD. + +--- setup.py.orig 2017-05-20 21:59:18.000000000 +0000 ++++ setup.py +@@ -71,6 +71,7 @@ class build_ext(distutils.command.build_ + fileName = os.path.splitext(self.get_ext_filename(ext.name))[0] + fullName = os.path.join(self.build_lib, fileName) + libraryDirs = ext.library_dirs or [] ++ runtimeLibraryDirs = ext.runtime_library_dirs or [] + libraries = self.get_libraries(ext) + extraArgs = ext.extra_link_args or [] + if sys.platform == "win32": +@@ -96,10 +97,12 @@ class build_ext(distutils.command.build_ + if vars["LOCALMODLIBS"]: + extraArgs.extend(vars["LOCALMODLIBS"].split()) + extraArgs.append("-s") ++ runtimeLibraryDirs.append(sys.prefix + "/lib") ++ libraryDirs.append(sys.prefix + "/lib") + self.compiler.link_executable(objects, fullName, + libraries = libraries, + library_dirs = libraryDirs, +- runtime_library_dirs = ext.runtime_library_dirs, ++ runtime_library_dirs = runtimeLibraryDirs, + extra_postargs = extraArgs, + debug = self.debug) + +@@ -136,13 +139,17 @@ if sys.platform == "win32": + if sys.platform == "win32": + libraries = ["imagehlp", "Shlwapi"] + else: +- libraries = [] ++ if sys.platform.startswith('netbsd'): ++ libraries = ["pthread"] ++ else: ++ libraries = [] ++ + utilModule = Extension("cx_Freeze.util", ["source/util.c"], + libraries = libraries) + + # build base executables + docFiles = "README.txt" +-scripts = ["cxfreeze", "cxfreeze-quickstart"] ++scripts = ["cxfreeze" + sys.version[:3], "cxfreeze-quickstart" + sys.version[:3]] + options = dict(bdist_rpm = dict(doc_files = docFiles), + install = dict(optimize = 1)) + depends = ["source/bases/Common.c"] --_----------=_1518163481200770--