svn commit: r521871 - in head: accessibility/caribou accessibility/orca editors/gedit-plugins

[Antoine Brodin]

Author: antoine
Date: Thu Jan  2 19:46:14 2020
New Revision: 521871
URL: https://svnweb.freebsd.org/changeset/ports/521871

Log:
  Clean up depends

Modified:
  head/accessibility/caribou/Makefile
  head/accessibility/orca/Makefile
  head/editors/gedit-plugins/Makefile

Modified: head/accessibility/caribou/Makefile
==============================================================================
--- head/accessibility/caribou/Makefile	Thu Jan  2 19:20:06 2020	(r521870)
+++ head/accessibility/caribou/Makefile	Thu Jan  2 19:46:14 2020	(r521871)
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter \
 		libjson-glib-1.0.so:devel/json-glib \
 		libatspi.so:accessibility/at-spi2-core \
 		libdbus-1.so:devel/dbus
-RUN_DEPENDS=	py3?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
 
 USES=		gettext gl gmake gnome libtool localbase pathfix \
 		pkgconfig python:3.3+ shebangfix tar:xz xorg

Modified: head/accessibility/orca/Makefile
==============================================================================
--- head/accessibility/orca/Makefile	Thu Jan  2 19:20:06 2020	(r521870)
+++ head/accessibility/orca/Makefile	Thu Jan  2 19:46:14 2020	(r521871)
@@ -14,16 +14,16 @@ COMMENT=	Scriptable screen reader
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
-		py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \
-		py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libatspi.so:accessibility/at-spi2-core
-RUN_DEPENDS=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
-		py3?-speech-dispatcher>=0:accessibility/py-speech-dispatcher@${PY_FLAVOR} \
-		py3?-atspi>=0:accessibility/py-atspi@${PY_FLAVOR} \
-		py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \
-		py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}speech-dispatcher>=0:accessibility/py-speech-dispatcher@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}atspi>=0:accessibility/py-atspi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
 
 # conflict with py*-json-py because orca uses the json from python itself
 # and py*-json-py shadows this.

Modified: head/editors/gedit-plugins/Makefile
==============================================================================
--- head/editors/gedit-plugins/Makefile	Thu Jan  2 19:20:06 2020	(r521870)
+++ head/editors/gedit-plugins/Makefile	Thu Jan  2 19:46:14 2020	(r521871)
@@ -36,9 +36,9 @@ GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gsche
 		org.gnome.gedit.plugins.wordcompletion.gschema.xml
 
 USES+=		python
-BUILD_DEPENDS+=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 LIB_DEPENDS+=	libgucharmap_2_90.so:deskutils/gucharmap
-RUN_DEPENDS+=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 USE_GNOME+=	vte3
 CONFIGURE_ARGS+=--enable-python