diff options
| author | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
| commit | 40359543350f97f6f4ce738f77467358da339880 (patch) | |
| tree | d8a48c8d2848b617581f63aeec6454f4736400cd /x11/py-Tk | |
| parent | 87993e055fdcca0d2b61250e291a62eff0eb64ff (diff) | |
| download | pkgsrc-40359543350f97f6f4ce738f77467358da339880.tar.gz | |
Remove USE_X11BASE and X11PREFIX.
Diffstat (limited to 'x11/py-Tk')
| -rw-r--r-- | x11/py-Tk/Makefile | 5 | ||||
| -rw-r--r-- | x11/py-Tk/files/setup.py | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 3f4ebc1d063..85e522faeed 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2014/03/13 11:08:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.61 2015/07/04 16:18:42 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION} PKGREVISION= 4 @@ -18,8 +18,7 @@ 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} +PY_SETUP_SUBST+= X11BASE=${X11BASE} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload .include "../../mk/bsd.prefs.mk" diff --git a/x11/py-Tk/files/setup.py b/x11/py-Tk/files/setup.py index 423bfda882c..3c710ba46c6 100644 --- a/x11/py-Tk/files/setup.py +++ b/x11/py-Tk/files/setup.py @@ -1,4 +1,4 @@ -# $NetBSD: setup.py,v 1.5 2015/05/27 20:46:34 wiz Exp $ +# $NetBSD: setup.py,v 1.6 2015/07/04 16:18:42 joerg Exp $ import distutils from distutils.core import setup, Extension @@ -11,10 +11,10 @@ tclrtlib = tclrtprefix + '/lib' tclincl = tclrtprefix + '/include/tcl/generic' tkrtprefix = '@TKRTPREFIX@' tkrtlib = tkrtprefix + '/lib' -x11prefix = '@X11PREFIX@' +x11prefix = '@X11BASE@' x11incl = x11prefix + '/include' x11lib = x11prefix + '/lib' -x11rtprefix = '@X11RTPREFIX@' +x11rtprefix = '@X11BASE@' x11rtlib = x11rtprefix + '/lib' setup( |