Thu Jan 2 18:59:05 2020 UTC ()
py-Tk: remove previous - Adam fixed it more generally


(markd)
diff -r1.67 -r1.68 pkgsrc/x11/py-Tk/Makefile
cvs diff -r1.67 -r1.68 pkgsrc/x11/py-Tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-Tk/Makefile 2019/12/12 10:46:15 1.67
+++ pkgsrc/x11/py-Tk/Makefile 2020/01/02 18:59:05 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.67 2019/12/12 10:46:15 markd Exp $ 1# $NetBSD: Makefile,v 1.68 2020/01/02 18:59:05 markd Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION} 3PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION}
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= x11 python 5CATEGORIES= x11 python
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://wiki.python.org/moin/TkInter 8HOMEPAGE= https://wiki.python.org/moin/TkInter
9COMMENT= Tkinter -- Python interface to Tcl/Tk 9COMMENT= Tkinter -- Python interface to Tcl/Tk
10LICENSE= python-software-foundation 10LICENSE= python-software-foundation
11 11
12USE_GCC_RUNTIME= yes 12USE_GCC_RUNTIME= yes
13 13
14EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ 14EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \
@@ -25,27 +25,24 @@ PYSETUPINSTALLARGS+= --install-lib ${PRE @@ -25,27 +25,24 @@ PYSETUPINSTALLARGS+= --install-lib ${PRE
25 25
26.if ${OPSYS} == "Darwin" 26.if ${OPSYS} == "Darwin"
27PY_SETUP_SUBST+= X11LIB= 27PY_SETUP_SUBST+= X11LIB=
28.else 28.else
29.include "../../x11/libX11/buildlink3.mk" 29.include "../../x11/libX11/buildlink3.mk"
30PY_SETUP_SUBST+= X11LIB=\'X11\' 30PY_SETUP_SUBST+= X11LIB=\'X11\'
31.endif 31.endif
32 32
33.include "../../lang/python/extension.mk" 33.include "../../lang/python/extension.mk"
34 34
35.if ${_PYTHON_VERSION} >= 27 35.if ${_PYTHON_VERSION} >= 27
36EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/tkinter.h 36EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/tkinter.h
37.endif 37.endif
38.if ${_PYTHON_VERSION} >= 38 
39EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic 
40.endif 
41 38
42# ignore errors due to missing files (EXTRACT_ELEMENTS!) 39# ignore errors due to missing files (EXTRACT_ELEMENTS!)
43do-patch: 40do-patch:
44 set -e; cd ${WRKSRC} && for f in ${PATCHDIR}/patch-*; do \ 41 set -e; cd ${WRKSRC} && for f in ${PATCHDIR}/patch-*; do \
45 ${PATCH} ${PATCHARGS} --batch <$$f || ${TRUE}; \ 42 ${PATCH} ${PATCHARGS} --batch <$$f || ${TRUE}; \
46 done 43 done
47 44
48.include "../../lang/python/srcdist.mk" 45.include "../../lang/python/srcdist.mk"
49.include "../../lang/tcl/buildlink3.mk" 46.include "../../lang/tcl/buildlink3.mk"
50.include "../../x11/tk/buildlink3.mk" 47.include "../../x11/tk/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"