summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorMarcus von Appen <mva@FreeBSD.org>2014-08-09 15:44:27 +0000
committerMarcus von Appen <mva@FreeBSD.org>2014-08-09 15:44:27 +0000
commit900db324a35a535534c39fc88ba374e4fe6c8d29 (patch)
treeb3bd70d2aa9673b13c4a53db11582d39b1e33eb7 /japanese
parent- Update to 2.31 (diff)
Convert the Python framework bits to USES=python.
Please use USES=python instead of USE_PYTHON. USE_PYTHON=yes becomes USES=python USE_PYTHON=2.7+ becomes USES=python:2.7+ USE_PYTHON_BUILD=3.3 becomes USES=python:3.3,build ... A new PYTHON_FEATURES variable was added, which enables certain features for a port and replaces some knobs at the same time; PYTHON_FEATURES=distutils replaces USE_PYDISTUTILS PYTHON_FEATURES=autoplist replaces PYDISTUTILS_AUTOPLIST PYTHON_FEATURES=py3kplist replaces PYTHON_PY3K_PLIST_HACK PYTHON_FEATURES=noegginfo replaces PYDISTUTILS_NOEGGINFO PYTHON_FEATURES=concurrent replaces PYTHON_CONCURRENT_INSTALL PYTHON_FEATURES=pythonprefix replaces USE_PYTHON_PREFIX Some knobs have been deprecated and are to be removed in the near future: PYTHON_MASTER_SITES - use MASTER_SITE_PYTHON instead PYTHON_PKGNAMESUFFIX - use PYTHON_PKGNAMEPREFIX instead PYDISTUTILS_INSTALLNOSINGLE - deprecated without replacement Some knobs have been removed completely: PYTHON_MASTER_SITE_SUBDIR PYTHON_DISTNAME PYTHON_WRKSRC Several variables specific to the Python framework are no longer passed to the build environment to avoid polluting dependency builds. PYTHON_VERSION is not passed to .MAKEFLAGS anymore PYTHON_DEFAULT_VERSION, PYTHON_DEFAULT_PORTVERSION and PYTHONBASE are not passed to the make environment anymore The conversion required a couple of ports to be updated to fit the changes and new requirements. Those included "bsd.python.mk" directly or contained checks in places, for which the USES framework would fail to provide correct values. Python modules directly using the upstream Python package (such as py-tkinter or py-sqlite3) were updated to avoid using the now unnecessary and remmoved knobs from "bsd.python.mk". Phabric: D399 exp-run: 167368 192357 PR: 167368 192357 Reviewed by: antoine, wg Exp-run award: antoine With hat: python@ Approved by: portmgr
Notes
Notes: svn path=/head/; revision=364450
Diffstat (limited to 'japanese')
-rw-r--r--japanese/libtomoe-gtk/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 32893cd75553..1308fe4e2336 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
#OPTIONS= GUCHARMAP "Compile with gucharmap" on
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
#.if defined(WITHOUT_GUCHARMAP)
CONFIGURE_ARGS+=--with-gucharmap=no
@@ -32,7 +32,6 @@ PLIST_SUB+= GUCHARMAP="@comment "
.if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc)
USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
pyexecdir=${PYTHON_SITELIBDIR}
PLIST_SUB+= PYTHON=""
@@ -41,4 +40,4 @@ CONFIGURE_ARGS+=--with-python=no
PLIST_SUB+= PYTHON="@comment "
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>