svn commit: r370100 - in head: deskutils/superkaramba devel/py-krosspython devel/py-pykde4 devel/py-pykdeuic4 devel/py-qt4 devel/py-qt4-qscintilla2 devel/py-sip editors/kate-plugin-pate games/kajon...

Alonso Schaich alonso at FreeBSD.org
Sun Oct 5 18:25:06 UTC 2014 

Author: alonso
Date: Sun Oct  5 18:25:00 2014
New Revision: 370100
URL: https://svnweb.freebsd.org/changeset/ports/370100
QAT: https://qat.redports.org/buildarchive/r370100/

Log:
  Replace USE_PYTHON* by USES=python.
  
  This commit consists of area51's r10314 and r10356 patchsets.
  
  Approved by:	rakuco (mentor)

Modified:
  head/deskutils/superkaramba/Makefile
  head/devel/py-krosspython/Makefile
  head/devel/py-pykde4/Makefile
  head/devel/py-pykdeuic4/Makefile
  head/devel/py-qt4-qscintilla2/Makefile
  head/devel/py-qt4/Makefile
  head/devel/py-qt4/bsd.pyqt.mk
  head/devel/py-sip/Makefile
  head/editors/kate-plugin-pate/Makefile
  head/games/kajongg/Makefile
  head/lang/qt5-qml/Makefile
  head/math/cantor/Makefile
  head/misc/py-qt4-demo/Makefile
  head/misc/py-qt4-doc/Makefile
  head/net-im/telepathy-logger-qt4/Makefile
  head/net-im/telepathy-logger/Makefile
  head/sysutils/qzeitgeist/Makefile
  head/www/webkit-qt5/Makefile
  head/x11/plasma-scriptengine-python/Makefile

Modified: head/deskutils/superkaramba/Makefile
==============================================================================
--- head/deskutils/superkaramba/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/deskutils/superkaramba/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -10,9 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Widget framework for KDE
 
-USE_PYTHON=	2
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource python:2 tar:xz
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 

Modified: head/devel/py-krosspython/Makefile
==============================================================================
--- head/devel/py-krosspython/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/devel/py-krosspython/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -13,9 +13,8 @@ MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Kross Python scripting library
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
-USE_PYTHON=	2
 USE_QT4=	corelib gui qmake_build moc_build uic_build rcc_build
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource python:2 tar:xz
 CMAKE_ARGS+=	-DBUILD_falcon:BOOL=FALSE \
 		-DBUILD_ruby:BOOL=FALSE \
 		-DBUILD_java:BOOL=FALSE

Modified: head/devel/py-pykde4/Makefile
==============================================================================
--- head/devel/py-pykde4/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/devel/py-pykde4/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -28,10 +28,9 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 
 USE_KDE4=	kdehier kdelibs kdeprefix okular pimlibs \
 		akonadi automoc4 soprano
-USE_PYTHON=	2
 USE_QT4=	corelib dbus designer_build gui network xml \
 		qmake_build moc_build uic_build rcc_build
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource python:2 tar:xz
 CMAKE_ARGS+=	-DWITH_PolkitQt:BOOL=FALSE
 
 SUB_FILES=	kdebindings4.pth

Modified: head/devel/py-pykdeuic4/Makefile
==============================================================================
--- head/devel/py-pykdeuic4/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/devel/py-pykdeuic4/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -13,10 +13,9 @@ MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Enhanced version of pyuic4
 
 USE_KDE4=	kdelibs automoc4 pykde4
-USE_PYTHON=	2
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 DISTINFO_FILE=	${PORTSDIR}/devel/py-pykde4/distinfo
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource python:2 tar:xz
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
 

Modified: head/devel/py-qt4-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt4-qscintilla2/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/devel/py-qt4-qscintilla2/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -22,7 +22,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 DESTDIRNAME=	INSTALL_ROOT
 DISTINFO_FILE=	${QSCI2_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
-USE_PYTHON=	yes
+USES=		python
 USE_QT4=	gui moc_build qmake_build
 QT_NONSTANDARD=	yes  # Do not add unknown arguments to CONFIGURE_ARGS.
 

Modified: head/devel/py-qt4/Makefile
==============================================================================
--- head/devel/py-qt4/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/devel/py-qt4/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Python bindings for the Qt 4 toolkit (meta port)
 
-USE_PYTHON=	yes
+USES=		python
 
 NO_BUILD=	yes
 NO_INSTALL=	yes

Modified: head/devel/py-qt4/bsd.pyqt.mk
==============================================================================
--- head/devel/py-qt4/bsd.pyqt.mk	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/devel/py-qt4/bsd.pyqt.mk	Sun Oct  5 18:25:00 2014	(r370100)
@@ -93,7 +93,7 @@ DISTNAME=	${PYQT4_DISTNAME}
 
 DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
-USE_PYTHON=	yes
+USES=		python
 
 QT_NONSTANDARD=	yes  # Do not add unknown arguments to CONFIGURE_ARGS.
 

Modified: head/devel/py-sip/Makefile
==============================================================================
--- head/devel/py-sip/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/devel/py-sip/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -12,8 +12,7 @@ DISTNAME=	${SIP_DISTNAME}
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
 
-USE_PYTHON=		yes
-PYTHON_PY3K_PLIST_HACK=	yes
+USE=		python:py3kplist
 
 DATADIR=	${PREFIX}/share/py-${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}

Modified: head/editors/kate-plugin-pate/Makefile
==============================================================================
--- head/editors/kate-plugin-pate/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/editors/kate-plugin-pate/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -11,12 +11,11 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Support for Python plugins in Kate
 
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource python tar:xz
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4 kate \
 		pykde4_build pykde4_run
 USE_QT4=	gui webkit \
 		moc_build qmake_build rcc_build uic_build
-USE_PYTHON=	yes
 
 DISTINFO_FILE=	${PORTSDIR}/editors/kate/distinfo
 

Modified: head/games/kajongg/Makefile
==============================================================================
--- head/games/kajongg/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/games/kajongg/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -10,10 +10,9 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-USES=		cmake:outsource tar:xz twisted:run
+USES=		cmake:outsource python tar:xz twisted:run
 USE_KDE4=	kdehier kdelibs kdeprefix pykde4 automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_PYTHON=	yes
 USE_SQLITE=	3
 CMAKE_ARGS=	-DINSTALL_KAJONGG:BOOL=TRUE
 

Modified: head/lang/qt5-qml/Makefile
==============================================================================
--- head/lang/qt5-qml/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/lang/qt5-qml/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -11,8 +11,7 @@ COMMENT=	Qt QML and JavaScript language 
 
 USE_QT5=	core network buildtools_build
 QT_DIST=	declarative
-USES=		qmake
-USE_PYTHON_BUILD=	yes
+USES=		python:build qmake
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 WRKSRC_SUBDIR=	src/${PORTNAME}

Modified: head/math/cantor/Makefile
==============================================================================
--- head/math/cantor/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/math/cantor/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -15,10 +15,9 @@ LIB_DEPENDS=	libspectre.so:${PORTSDIR}/p
 		libanalitza.so:${PORTSDIR}/math/analitza
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
-USES=		cmake:outsource pkgconfig tar:xz
+USES=		cmake:outsource pkgconfig python:2 tar:xz
 USE_QT4=	corelib qtestlib_build xml xmlpatterns \
 		moc_build qmake_build rcc_build uic_build
-USE_PYTHON=	2
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	MAXIMA OCTAVE R SAGE SCILAB

Modified: head/misc/py-qt4-demo/Makefile
==============================================================================
--- head/misc/py-qt4-demo/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/misc/py-qt4-demo/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -13,7 +13,8 @@ MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Python bindings for the Qt4 toolkit, Qt demo and examples
 
 DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
-USE_PYTHON=	yes
+
+USES=		python
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-qt4
 

Modified: head/misc/py-qt4-doc/Makefile
==============================================================================
--- head/misc/py-qt4-doc/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/misc/py-qt4-doc/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -14,7 +14,8 @@ COMMENT=	Python bindings for the Qt4 too
 
 DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 NO_BUILD=	yes
-USE_PYTHON=	yes
+
+USES=		python
 
 DOCSDIR=	${PREFIX}/share/doc/py-qt4
 

Modified: head/net-im/telepathy-logger-qt4/Makefile
==============================================================================
--- head/net-im/telepathy-logger-qt4/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/net-im/telepathy-logger-qt4/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -22,9 +22,8 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/de
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER=	qt4
 USE_KDE4=	# empty
-USE_PYTHON_BUILD=	yes
 USE_QT4=	corelib dbus moc_build qmake_build rcc_build uic_build
-USES=		bison:build cmake pkgconfig tar:bzip2
+USES=		bison:build cmake pkgconfig python:build tar:bzip2
 CMAKE_ARGS=	-DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR:BOOL=True
 USE_LDCONFIG=	yes
 

Modified: head/net-im/telepathy-logger/Makefile
==============================================================================
--- head/net-im/telepathy-logger/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/net-im/telepathy-logger/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -16,13 +16,12 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDI
 
 LICENSE=	LGPL21
 
-USES=		pkgconfig gmake libtool pathfix tar:bzip2
+USES=		pkgconfig gmake libtool pathfix python:build tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 intltool gnomedocutils libxml2 \
 		libxslt:build introspection:build
 USE_SQLITE=	yes
-USE_PYTHON_BUILD=	yes
 GLIB_SCHEMAS=	org.freedesktop.Telepathy.Logger.gschema.xml
 
 post-patch:

Modified: head/sysutils/qzeitgeist/Makefile
==============================================================================
--- head/sysutils/qzeitgeist/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/sysutils/qzeitgeist/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -22,10 +22,9 @@ BUILD_DEPENDS=	rapper:${PORTSDIR}/textpr
 		${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
 
 USE_KDE4=	automoc4
-USE_PYTHON_BUILD=	yes
 USE_QT4=	dbus declarative qtestlib \
 		moc_build qmake_build rcc_build uic_build
-USES=		tar:bzip2 cmake
+USES=		cmake python:build tar:bzip2
 USE_LDCONFIG=	yes
 
 # To be kept in sync with sysutils/zeitgeist.

Modified: head/www/webkit-qt5/Makefile
==============================================================================
--- head/www/webkit-qt5/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/www/webkit-qt5/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${P
 USE_GL=		gl
 USE_GNOME=	libxml2 libxslt
 USE_PERL5=	build
-USE_PYTHON_BUILD=	yes
 USE_QT5=	core gui network opengl printsupport qml quick sql \
 		testlib widgets buildtools_build
 QT_DIST=	${PORTNAME}
@@ -27,7 +26,7 @@ USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 USE_SQLITE=	3
 USE_XORG=	x11 xcomposite xrender
-USES=		bison:build gmake perl5 pkgconfig qmake:outsource
+USES=		bison:build gmake perl5 pkgconfig python:build qmake:outsource
 # Keep make(1) from descending into obj/ subdirectories during tests.
 CONFIGURE_ENV=	MAKEOBJDIR=.
 # Use flex(1) from ports.

Modified: head/x11/plasma-scriptengine-python/Makefile
==============================================================================
--- head/x11/plasma-scriptengine-python/Makefile	Sun Oct  5 18:01:19 2014	(r370099)
+++ head/x11/plasma-scriptengine-python/Makefile	Sun Oct  5 18:25:00 2014	(r370100)
@@ -13,9 +13,8 @@ COMMENT=	Plasma scriptengine for Python
 
 USE_KDE4=	kdehier kdelibs kdeprefix pykde4 automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
-USE_PYTHON=	2
 DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource python:2 tar:xz
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/plasma/generic/scriptengines/python

More information about the svn-ports-all mailing list