diff options
| author | adam <adam@pkgsrc.org> | 2013-08-09 15:18:58 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-08-09 15:18:58 +0000 |
| commit | 4b7979331a0c0c1314a137b53346a81f79b9ab29 (patch) | |
| tree | 7caa0562cc9b380254f3e40ab702531290305ba0 /x11 | |
| parent | 145ac7d96d5b1e3bae491689bbfd85bc5c635f93 (diff) | |
| download | pkgsrc-4b7979331a0c0c1314a137b53346a81f79b9ab29.tar.gz | |
Don't link against X11 on Darwin
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/py-Tk/Makefile | 30 | ||||
| -rw-r--r-- | x11/py-Tk/files/setup.py | 4 |
2 files changed, 20 insertions, 14 deletions
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index d5dbef1185f..d294f3876c2 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2013/06/06 12:55:20 wiz Exp $ -# +# $NetBSD: Makefile,v 1.57 2013/08/09 15:18:58 adam Exp $ PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION} PKGREVISION= 3 @@ -8,21 +7,29 @@ CATEGORIES= x11 python MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://wiki.python.org/moin/TkInter COMMENT= Tkinter -- Python interface to Tcl/Tk +LICENSE= python-software-foundation PYTHON_VERSIONS_INCLUDE_3X= yes EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ ${PYSUBDIR}/Modules/tkappinit.c -PYDISTUTILSPKG= yes -PY_PATCHPLIST= yes - -PY_SETUP_SUBST+= BLPREFIX=${LOCALBASE} -PY_SETUP_SUBST+= TCLRTPREFIX=${BUILDLINK_PREFIX.tcl} -PY_SETUP_SUBST+= TKRTPREFIX=${BUILDLINK_PREFIX.tk} -PY_SETUP_SUBST+= X11PREFIX=${X11BASE} -PY_SETUP_SUBST+= X11RTPREFIX=${X11BASE} +PYDISTUTILSPKG= yes +PY_PATCHPLIST= yes +PY_SETUP_SUBST+= BLPREFIX=${LOCALBASE} +PY_SETUP_SUBST+= TCLRTPREFIX=${BUILDLINK_PREFIX.tcl} +PY_SETUP_SUBST+= TKRTPREFIX=${BUILDLINK_PREFIX.tk} +PY_SETUP_SUBST+= X11PREFIX=${X11BASE} +PY_SETUP_SUBST+= X11RTPREFIX=${X11BASE} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" +PY_SETUP_SUBST+= X11LIB= +.else +PY_SETUP_SUBST+= X11LIB=\'X11\' +.endif + .include "../../lang/python/extension.mk" .if ${_PYTHON_VERSION} >= 27 @@ -31,12 +38,11 @@ EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/tkinter.h # ignore errors due to missing files (EXTRACT_ELEMENTS!) do-patch: - cd ${WRKSRC} && for f in ${PATCHDIR}/patch-*; do \ + 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" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-Tk/files/setup.py b/x11/py-Tk/files/setup.py index 27702ce0dbd..829c28230a1 100644 --- a/x11/py-Tk/files/setup.py +++ b/x11/py-Tk/files/setup.py @@ -1,4 +1,4 @@ -# $NetBSD: setup.py,v 1.3 2004/03/10 19:29:31 minskim Exp $ +# $NetBSD: setup.py,v 1.4 2013/08/09 15:18:58 adam Exp $ import distutils from distutils.core import setup, Extension @@ -25,7 +25,7 @@ setup( include_dirs=[blincl, x11incl], library_dirs=[bllib, x11lib], runtime_library_dirs=[tclrtlib, tkrtlib, x11rtlib], - libraries=['tk', 'tcl', 'X11'] + libraries=['tk', 'tcl', @X11LIB@] ) ] ) |