diff options
Diffstat (limited to 'x11-toolkits/py-tkinter')
-rw-r--r-- | x11-toolkits/py-tkinter/Makefile | 11 | ||||
-rw-r--r-- | x11-toolkits/py-tkinter/files/setup.py.in | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile index 904493a8ddbb..ee9849b75ec2 100644 --- a/x11-toolkits/py-tkinter/Makefile +++ b/x11-toolkits/py-tkinter/Makefile @@ -1,6 +1,6 @@ PORTNAME= tkinter DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-toolkits python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,8 +16,9 @@ LICENSE_FILE= ${WRKDIR}/Python-${DISTVERSION}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -USES= compiler:c11 python tar:xz tk:86 +USES= compiler:c11 python tar:xz tk:86 xorg USE_PYTHON= allflavors autoplist pep517 +USE_XORG= x11 DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC_SUBDIR= Modules @@ -26,7 +27,7 @@ SUB_LIST+= DISTVERSION=${DISTVERSION} \ TK_VER=${TK_VER} SUB_FILES= pyproject.toml \ setup.py -PLIST_FILES= ${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}/lib-dynload/_tkinter${PYTHON_EXT_SUFFIX}.so +PLIST_FILES= ${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}/lib-dynload/_tkinter${PYTHON_TAG}.so PORTSCOUT= ignore:1 @@ -35,10 +36,10 @@ pre-configure: @${MV} ${WRKDIR}/setup.py ${WRKSRC} post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tkinter${PYTHON_EXT_SUFFIX}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tkinter${PYTHON_TAG}.so # lib-dynload is the expected location @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/lib-dynload - @(cd ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/lib-dynload && ${LN} -s ../site-packages/_tkinter${PYTHON_EXT_SUFFIX}.so) + @(cd ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/lib-dynload && ${LN} -s ../site-packages/_tkinter${PYTHON_TAG}.so) do-test: @${PYTHON_CMD} -c 'import tkinter' # minimal smoke test diff --git a/x11-toolkits/py-tkinter/files/setup.py.in b/x11-toolkits/py-tkinter/files/setup.py.in index 493bf949a682..fbf905a2e27a 100644 --- a/x11-toolkits/py-tkinter/files/setup.py.in +++ b/x11-toolkits/py-tkinter/files/setup.py.in @@ -7,17 +7,18 @@ from setuptools import setup, Extension tkversion = "%%TK_VER%%" prefix = sysconfig.get_config_var('prefix') x11base = sys.prefix or '/usr/X11R6' -inc_dirs = [prefix + "/include", +inc_dirs = [sysconfig.get_path('include') + "/internal", prefix + "/include/tcl" + tkversion, prefix + "/include/tk" + tkversion, x11base + "/include"] -lib_dirs = [prefix + "/lib", x11base + "/lib"] +lib_dirs = [x11base + "/lib"] libs = ["tcl" + tkversion.replace(".", ""), "tk" + tkversion.replace(".", ""), "X11"] +macros = [('Py_BUILD_CORE_MODULE', 1), ('WITH_APPINIT', 1)] setup(ext_modules = [Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], - define_macros=[('WITH_APPINIT', 1)], + define_macros=macros, include_dirs = inc_dirs, libraries = libs, library_dirs = lib_dirs)] |