Received: by mail.netbsd.org (Postfix, from userid 605) id 197E984E1F; Wed, 8 Jan 2020 13:44:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9683C84E07 for ; Wed, 8 Jan 2020 13:44:43 +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 MeA-R-02nDFT for ; Wed, 8 Jan 2020 13:44:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8F96F84DE1 for ; Wed, 8 Jan 2020 13:44:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89033FBF4; Wed, 8 Jan 2020 13:44:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157849108218850" MIME-Version: 1.0 Date: Wed, 8 Jan 2020 13:44:42 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200108134442.89033FBF4@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. --_----------=_157849108218850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Wed Jan 8 13:44:42 UTC 2020 Modified Files: pkgsrc/databases/py-gdbm: Makefile pkgsrc/databases/py-sqlite3: Makefile pkgsrc/devel/py-curses: Makefile pkgsrc/devel/py-cursespanel: Makefile pkgsrc/devel/py-idle: Makefile pkgsrc/devel/py-readline: Makefile pkgsrc/lang/python: srcdist.mk pkgsrc/textproc/py-cElementTree: Makefile pkgsrc/textproc/py-expat: Makefile pkgsrc/x11/py-Tk: Makefile Log Message: Always extract the full Python distfile for modules. This retires an old "optimisation" that over time has created more problems than it solved, including various questions from users about the ignored patch failures. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/databases/py-gdbm/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/py-sqlite3/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/py-curses/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-cursespanel/Makefile cvs rdiff -u -r1.38 -r1.39 pkgsrc/devel/py-idle/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/py-readline/Makefile cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/python/srcdist.mk cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/py-cElementTree/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/textproc/py-expat/Makefile cvs rdiff -u -r1.69 -r1.70 pkgsrc/x11/py-Tk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157849108218850 Content-Disposition: inline Content-Length: 11714 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/py-gdbm/Makefile diff -u pkgsrc/databases/py-gdbm/Makefile:1.40 pkgsrc/databases/py-gdbm/Makefile:1.41 --- pkgsrc/databases/py-gdbm/Makefile:1.40 Sun Dec 15 14:42:27 2019 +++ pkgsrc/databases/py-gdbm/Makefile Wed Jan 8 13:44:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2019/12/15 14:42:27 adam Exp $ +# $NetBSD: Makefile,v 1.41 2020/01/08 13:44:41 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-gdbm-${PY_DISTVERSION} PKGREVISION= 1 @@ -8,8 +8,6 @@ MAINTAINER= dolecek@ics.muni.cz HOMEPAGE= https://docs.python.org/3/library/dbm.html#module-dbm.gnu COMMENT= Python interface to gdbm - GNU database manager -USE_TOOLS+= patch - .include "../../lang/python/pyversion.mk" .if !empty(PYPKGPREFIX:Mpy3?) GDBM_MODNAME= _gdbm @@ -17,7 +15,6 @@ GDBM_MODNAME= _gdbm GDBM_MODNAME= gdbm .endif -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/${GDBM_MODNAME}module.c PYDISTUTILSPKG= yes PY_SETUP_SUBST+= GDBMPREFIX=${BUILDLINK_PREFIX.gdbm} @@ -25,14 +22,6 @@ PY_SETUP_SUBST+= GDBM_MODNAME=${GDBM_MOD PLIST_SUBST+= GDBM_MODNAME=${GDBM_MODNAME} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - set -e; \ - cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-*; do \ - ${PATCH} --batch < "$$f" || ${TRUE}; \ - done - .include "../../databases/gdbm/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" Index: pkgsrc/databases/py-sqlite3/Makefile diff -u pkgsrc/databases/py-sqlite3/Makefile:1.35 pkgsrc/databases/py-sqlite3/Makefile:1.36 --- pkgsrc/databases/py-sqlite3/Makefile:1.35 Sat Nov 2 15:38:10 2019 +++ pkgsrc/databases/py-sqlite3/Makefile Wed Jan 8 13:44:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/11/02 15:38:10 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2020/01/08 13:44:41 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-sqlite3-${PY_DISTVERSION} PKGREVISION= 15 @@ -9,23 +9,12 @@ HOMEPAGE= https://www.python.org/ COMMENT= Built-in sqlite support for Python 2.5 and up USE_GCC_RUNTIME= yes -USE_TOOLS+= patch - -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_sqlite # part of python itself; using distutils.mk will install a useless egg PYDISTUTILSPKG= yes PY_SETUP_SUBST+= SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - set -e; \ - cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-*; do \ - ${PATCH} --batch < "$$f" || ${TRUE}; \ - done - .include "../../databases/sqlite3/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" Index: pkgsrc/devel/py-curses/Makefile diff -u pkgsrc/devel/py-curses/Makefile:1.50 pkgsrc/devel/py-curses/Makefile:1.51 --- pkgsrc/devel/py-curses/Makefile:1.50 Sun Dec 15 14:42:27 2019 +++ pkgsrc/devel/py-curses/Makefile Wed Jan 8 13:44:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/12/15 14:42:27 adam Exp $ +# $NetBSD: Makefile,v 1.51 2020/01/08 13:44:41 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-curses-${PY_DISTVERSION} PKGREVISION= 5 @@ -8,7 +8,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= https://www.python.org/doc/current/lib/module-curses.html COMMENT= Curses module for Python -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_cursesmodule.c PYDISTUTILSPKG= yes PY_PATCHPLIST= yes @@ -20,14 +19,6 @@ FAKE_NCURSES= yes PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - set -e; \ - cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-*; do \ - ${PATCH} --batch < "$$f" || ${TRUE}; \ - done - .include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" .include "../../mk/curses.buildlink3.mk" Index: pkgsrc/devel/py-cursespanel/Makefile diff -u pkgsrc/devel/py-cursespanel/Makefile:1.33 pkgsrc/devel/py-cursespanel/Makefile:1.34 --- pkgsrc/devel/py-cursespanel/Makefile:1.33 Sun Dec 15 14:42:27 2019 +++ pkgsrc/devel/py-cursespanel/Makefile Wed Jan 8 13:44:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/12/15 14:42:27 adam Exp $ +# $NetBSD: Makefile,v 1.34 2020/01/08 13:44:41 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-cursespanel-${PY_DISTVERSION} PKGREVISION= 4 @@ -13,19 +13,11 @@ DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:. USE_CURSES= getsyx FAKE_NCURSES= yes -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_curses_panel.c PYDISTUTILSPKG= yes PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - (cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-*;do \ - ${PATCH} --batch <$$f || ${TRUE}; \ - done) - .include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" .include "../../mk/curses.buildlink3.mk" Index: pkgsrc/devel/py-idle/Makefile diff -u pkgsrc/devel/py-idle/Makefile:1.38 pkgsrc/devel/py-idle/Makefile:1.39 --- pkgsrc/devel/py-idle/Makefile:1.38 Sun Nov 3 10:18:28 2019 +++ pkgsrc/devel/py-idle/Makefile Wed Jan 8 13:44:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/11/03 10:18:28 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2020/01/08 13:44:41 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-idle-${PY_DISTVERSION} CATEGORIES= devel python @@ -11,13 +11,6 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../.. PY_PATCHPLIST= yes -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - (cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-*;do \ - ${PATCH} --batch <$$f || ${TRUE}; \ - done) - # # With Python-2.3 and up, the Idle code is part of the base library. # We just install a wrapper script. Also, threads are required now. @@ -31,7 +24,6 @@ IDLE_NAME= idle3 IDLE_NAME= idle .endif -EXTRACT_ELEMENTS= ${PYSUBDIR}/Tools/scripts/${IDLE_NAME} REPLACE_PYTHON= Tools/scripts/${IDLE_NAME} NO_BUILD= yes INSTALLATION_DIRS= bin Index: pkgsrc/devel/py-readline/Makefile diff -u pkgsrc/devel/py-readline/Makefile:1.34 pkgsrc/devel/py-readline/Makefile:1.35 --- pkgsrc/devel/py-readline/Makefile:1.34 Sun Dec 15 14:42:26 2019 +++ pkgsrc/devel/py-readline/Makefile Wed Jan 8 13:44:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/12/15 14:42:26 adam Exp $ +# $NetBSD: Makefile,v 1.35 2020/01/08 13:44:41 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-readline-${PY_DISTVERSION} CATEGORIES= devel misc python @@ -7,8 +7,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://docs.python.org/3/library/readline.html COMMENT= Line editing support for Python -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c - USE_GCC_RUNTIME= yes PYDISTUTILSPKG= yes @@ -16,13 +14,6 @@ PY_SETUP_SUBST+= RLPREFIX=${BUILDLINK_PR PY_SETUP_SUBST+= RLRTPREFIX=${BUILDLINK_PREFIX.readline} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - (cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-*;do \ - ${PATCH} --batch <$$f || ${TRUE}; \ - done) - .include "../../devel/readline/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" Index: pkgsrc/lang/python/srcdist.mk diff -u pkgsrc/lang/python/srcdist.mk:1.39 pkgsrc/lang/python/srcdist.mk:1.40 --- pkgsrc/lang/python/srcdist.mk:1.39 Sun Dec 15 14:42:26 2019 +++ pkgsrc/lang/python/srcdist.mk Wed Jan 8 13:44:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: srcdist.mk,v 1.39 2019/12/15 14:42:26 adam Exp $ +# $NetBSD: srcdist.mk,v 1.40 2020/01/08 13:44:41 joerg Exp $ .include "../../lang/python/pyversion.mk" @@ -11,10 +11,6 @@ WRKSRC= ${WRKDIR}/${PYSUBDIR} # This is used for standard modules shipped with Python but build as # separate packages. -. if ${_PYTHON_VERSION} != 27 -EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic -. endif - # Standard modules depend on their own version BUILDLINK_API_DEPENDS.${PYPACKAGE}+= ${PYPACKAGE}>=${PY_DISTVERSION} BUILDLINK_ABI_DEPENDS.${PYPACKAGE}+= ${PYPACKAGE}>=${PY_DISTVERSION} @@ -23,5 +19,5 @@ python-std-patchsetup: ${SED} ${PY_SETUP_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \ <${FILESDIR}/setup.py >${WRKSRC}/setup.py -post-extract: python-std-patchsetup +post-patch: python-std-patchsetup .endif Index: pkgsrc/textproc/py-cElementTree/Makefile diff -u pkgsrc/textproc/py-cElementTree/Makefile:1.16 pkgsrc/textproc/py-cElementTree/Makefile:1.17 --- pkgsrc/textproc/py-cElementTree/Makefile:1.16 Fri Jan 3 08:03:59 2020 +++ pkgsrc/textproc/py-cElementTree/Makefile Wed Jan 8 13:44:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2020/01/03 08:03:59 adam Exp $ +# $NetBSD: Makefile,v 1.17 2020/01/08 13:44:42 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION} CATEGORIES= textproc python @@ -7,10 +7,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.effbot.org/zone/celementtree.htm COMMENT= C implementation of Python ElementTree API -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_elementtree.c - USE_GCC_RUNTIME= yes -USE_TOOLS+= patch PYDISTUTILSPKG= yes PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} @@ -18,13 +15,6 @@ PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLI PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - (cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-*;do \ - ${PATCH} --batch <$$f || ${TRUE}; \ - done) - .include "../../textproc/expat/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" Index: pkgsrc/textproc/py-expat/Makefile diff -u pkgsrc/textproc/py-expat/Makefile:1.29 pkgsrc/textproc/py-expat/Makefile:1.30 --- pkgsrc/textproc/py-expat/Makefile:1.29 Mon Nov 4 21:43:45 2019 +++ pkgsrc/textproc/py-expat/Makefile Wed Jan 8 13:44:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/11/04 21:43:45 rillig Exp $ +# $NetBSD: Makefile,v 1.30 2020/01/08 13:44:42 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-expat-${PY_DISTVERSION} CATEGORIES= textproc python @@ -7,12 +7,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.python.org/ COMMENT= Python interface to expat -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c -.include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} != 27 -EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic/pyexpat.c.h -.endif - USE_GCC_RUNTIME= yes PYDISTUTILSPKG= yes Index: pkgsrc/x11/py-Tk/Makefile diff -u pkgsrc/x11/py-Tk/Makefile:1.69 pkgsrc/x11/py-Tk/Makefile:1.70 --- pkgsrc/x11/py-Tk/Makefile:1.69 Fri Jan 3 06:24:42 2020 +++ pkgsrc/x11/py-Tk/Makefile Wed Jan 8 13:44:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2020/01/03 06:24:42 adam Exp $ +# $NetBSD: Makefile,v 1.70 2020/01/08 13:44:42 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION} PKGREVISION= 5 @@ -11,8 +11,6 @@ LICENSE= python-software-foundation USE_GCC_RUNTIME= yes -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ - ${PYSUBDIR}/Modules/tkappinit.c PYDISTUTILSPKG= yes PY_SETUP_SUBST+= BLPREFIX=${LOCALBASE} PY_SETUP_SUBST+= TCLRTPREFIX=${BUILDLINK_PREFIX.tcl} @@ -30,17 +28,6 @@ PY_SETUP_SUBST+= X11LIB=\'X11\' .endif .include "../../lang/python/extension.mk" - -.if ${_PYTHON_VERSION} >= 27 -EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/tkinter.h -.endif - -# ignore errors due to missing files (EXTRACT_ELEMENTS!) -do-patch: - set -e; cd ${WRKSRC} && for f in ${PATCHDIR}/patch-*; do \ - ${PATCH} ${PATCHARGS} --batch <$$f || ${TRUE}; \ - done - .include "../../lang/python/srcdist.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" --_----------=_157849108218850--