Tue Apr 3 18:22:47 2018 UTC ()
py-Tk: Darwin does not need libX11


(adam)
diff -r1.65 -r1.66 pkgsrc/x11/py-Tk/Makefile
cvs diff -r1.65 -r1.66 pkgsrc/x11/py-Tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-Tk/Makefile 2018/03/12 11:17:55 1.65
+++ pkgsrc/x11/py-Tk/Makefile 2018/04/03 18:22:47 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.65 2018/03/12 11:17:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.66 2018/04/03 18:22:47 adam 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 \
@@ -16,33 +16,33 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_t @@ -16,33 +16,33 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_t
16PYDISTUTILSPKG= yes 16PYDISTUTILSPKG= yes
17PY_PATCHPLIST= yes 17PY_PATCHPLIST= yes
18PY_SETUP_SUBST+= BLPREFIX=${LOCALBASE} 18PY_SETUP_SUBST+= BLPREFIX=${LOCALBASE}
19PY_SETUP_SUBST+= TCLRTPREFIX=${BUILDLINK_PREFIX.tcl} 19PY_SETUP_SUBST+= TCLRTPREFIX=${BUILDLINK_PREFIX.tcl}
20PY_SETUP_SUBST+= TKRTPREFIX=${BUILDLINK_PREFIX.tk} 20PY_SETUP_SUBST+= TKRTPREFIX=${BUILDLINK_PREFIX.tk}
21PY_SETUP_SUBST+= X11BASE=${X11BASE} 21PY_SETUP_SUBST+= X11BASE=${X11BASE}
22PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload 22PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
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"
29PY_SETUP_SUBST+= X11LIB=\'X11\' 30PY_SETUP_SUBST+= X11LIB=\'X11\'
30.endif 31.endif
31 32
32.include "../../lang/python/extension.mk" 33.include "../../lang/python/extension.mk"
33 34
34.if ${_PYTHON_VERSION} >= 27 35.if ${_PYTHON_VERSION} >= 27
35EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/tkinter.h 36EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/tkinter.h
36.endif 37.endif
37 38
38# ignore errors due to missing files (EXTRACT_ELEMENTS!) 39# ignore errors due to missing files (EXTRACT_ELEMENTS!)
39do-patch: 40do-patch:
40 set -e; cd ${WRKSRC} && for f in ${PATCHDIR}/patch-*; do \ 41 set -e; cd ${WRKSRC} && for f in ${PATCHDIR}/patch-*; do \
41 ${PATCH} ${PATCHARGS} --batch <$$f || ${TRUE}; \ 42 ${PATCH} ${PATCHARGS} --batch <$$f || ${TRUE}; \
42 done 43 done
43 44
44.include "../../lang/python/srcdist.mk" 45.include "../../lang/python/srcdist.mk"
45.include "../../lang/tcl/buildlink3.mk" 46.include "../../lang/tcl/buildlink3.mk"
46.include "../../x11/tk/buildlink3.mk" 47.include "../../x11/tk/buildlink3.mk"
47.include "../../x11/libX11/buildlink3.mk" 
48.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"