Index: accessibility/orca/Makefile =================================================================== --- accessibility/orca/Makefile (révision 552077) +++ accessibility/orca/Makefile (copie de travail) @@ -3,6 +3,7 @@ PORTNAME= orca PORTVERSION= 3.38.0 +PORTREVISION= 1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -15,7 +16,7 @@ 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} \ + ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py3-cairo@${PY_FLAVOR} \ itstool:textproc/itstool LIB_DEPENDS= libatspi.so:accessibility/at-spi2-core RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ @@ -22,7 +23,7 @@ ${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} + ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py3-cairo@${PY_FLAVOR} # conflict with py*-json-py because orca uses the json from python itself # and py*-json-py shadows this. Index: astro/gpsd/Makefile =================================================================== --- astro/gpsd/Makefile (révision 552077) +++ astro/gpsd/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= gpsd PORTVERSION= 3.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro geography MASTER_SITES= SAVANNAH @@ -133,7 +133,7 @@ NCURSES_USES= ncurses RECONFIGURE_MAKE_ARGS_OFF= reconfigure=no CPPBIND_MAKE_ARGS_OFF= libgpsmm=no -X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \ +X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR} X11_USES= gnome Index: audio/pulseeffects/Makefile =================================================================== --- audio/pulseeffects/Makefile (révision 552077) +++ audio/pulseeffects/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= pulseeffects DISTVERSIONPREFIX= v DISTVERSION= 4.6.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MAINTAINER= daniel@shafer.cc @@ -12,7 +12,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ @@ -31,7 +31,7 @@ libsord-0.so:devel/sord \ libsratom-0.so:audio/sratom \ libzita-convolver.so:audio/zita-convolver -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ Index: comms/gnuradio/Makefile =================================================================== --- comms/gnuradio/Makefile (révision 552077) +++ comms/gnuradio/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= gnuradio DISTVERSIONPREFIX= v DISTVERSION= 3.8.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms astro hamradio MAINTAINER= hamradio@FreeBSD.org @@ -19,7 +19,7 @@ ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \ Index: devel/pygobject3-common/Makefile =================================================================== --- devel/pygobject3-common/Makefile (révision 552077) +++ devel/pygobject3-common/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= gobject PORTVERSION= 3.28.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX?= py @@ -36,8 +36,8 @@ .if ${SLAVE_PORT} == no PORTSCOUT?= limitw:1,even -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} -USES+= gnome python:build +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py3-cairo@${PY_FLAVOR} +USES+= gnome python:3.5+,build USE_GNOME= glib20:build introspection:build NO_BUILD= yes @@ -56,10 +56,10 @@ RUN_DEPENDS+= pygobject3-common>=0:devel/pygobject3-common .if ${SLAVE_PORT} == python -USES+= python +USES+= python:3.5+ USE_PYTHON= flavors py3kplist -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py3-cairo@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/pyi3-cairo@${PY_FLAVOR} .endif post-install: Index: graphics/Makefile =================================================================== --- graphics/Makefile (révision 552077) +++ graphics/Makefile (copie de travail) @@ -793,6 +793,7 @@ SUBDIR += py-blockdiag SUBDIR += py-blockdiagcontrib-cisco SUBDIR += py-cairo + SUBDIR += py3-cairo SUBDIR += py-cairocffi SUBDIR += py-cairosvg SUBDIR += py-cartopy Index: graphics/py-cairo/Makefile =================================================================== --- graphics/py-cairo/Makefile (révision 552077) +++ graphics/py-cairo/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= cairo PORTVERSION= 1.18.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics python MASTER_SITES= https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/ @@ -20,10 +20,12 @@ PORTSCOUT= limitw:1,even -USES= compiler:c11 gnome pkgconfig python +USES= compiler:c11 gnome pkgconfig python:2.7 USE_PYTHON= distutils py3kplist USE_GNOME= cairo +CONFLICTS= py3*-cairo-* + PLIST_SUB= PORTVER=${PORTVERSION} post-install: Index: graphics/py-cairo/pkg-plist =================================================================== --- graphics/py-cairo/pkg-plist (révision 552077) +++ graphics/py-cairo/pkg-plist (copie de travail) @@ -1,16 +1,13 @@ -%%PYTHON2%%include/pycairo/pycairo.h -%%PYTHON3%%include/pycairo/py3cairo.h +include/pycairo/pycairo.h %%PYTHON_SITELIBDIR%%/cairo/__init__.py %%PYTHON_SITELIBDIR%%/cairo/__init__.pyc %%PYTHON_SITELIBDIR%%/cairo/__init__.pyi %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo %%PYTHON_SITELIBDIR%%/cairo/_cairo.so -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cairo/include/pycairo.h -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/cairo/include/py3cairo.h +%%PYTHON_SITELIBDIR%%/cairo/include/pycairo.h %%PYTHON_SITELIBDIR%%/cairo/py.typed %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt -%%PYTHON2%%libdata/pkgconfig/pycairo.pc -%%PYTHON3%%libdata/pkgconfig/py3cairo.pc +libdata/pkgconfig/pycairo.pc Index: graphics/py-photocollage/Makefile =================================================================== --- graphics/py-photocollage/Makefile (révision 552077) +++ graphics/py-photocollage/Makefile (copie de travail) @@ -2,7 +2,7 @@ PORTNAME= photocollage DISTVERSION= 1.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,8 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} \ ${PY_PILLOW} USES= gettext-tools python @@ -21,6 +20,12 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +.if ${PYTHON_MAJOR_VER} == 2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py3-cairo@${PY_FLAVOR} +.endif + post-patch: @${REINPLACE_CMD} -e ' \ s|${PORTNAME}|${PORTNAME}-${PYTHON_VER}| ; \ Index: graphics/py-pycha/Makefile =================================================================== --- graphics/py-pycha/Makefile (révision 552077) +++ graphics/py-pycha/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= pycha PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,6 +24,10 @@ OPTIONS_DEFINE= CAIRO OPTIONS_DEFAULT=CAIRO +.if ${PYTHON_MAJOR_VER} == 2 CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} +.else +CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py3-cairo@${PY_FLAVOR} +.endif .include Index: graphics/py3-cairo/Makefile =================================================================== --- graphics/py3-cairo/Makefile (révision 552077) +++ graphics/py3-cairo/Makefile (copie de travail) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cairo -PORTVERSION= 1.18.1 -PORTREVISION= 1 +PORTVERSION= 1.20.0 PORTEPOCH= 1 CATEGORIES= graphics python MASTER_SITES= https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/ @@ -11,7 +10,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= desktop@FreeBSD.org -COMMENT= Python 2 bindings for Cairo +COMMENT= Python 3 bindings for Cairo LICENSE= LGPL21 MPL11 LICENSE_COMB= multi @@ -20,10 +19,12 @@ PORTSCOUT= limitw:1,even -USES= compiler:c11 gnome pkgconfig python -USE_PYTHON= distutils py3kplist +USES= compiler:c11 gnome pkgconfig python:3.6+ +USE_PYTHON= flavors distutils py3kplist USE_GNOME= cairo +CONFLICTS= py2*-cairo-1.18.1 + PLIST_SUB= PORTVER=${PORTVERSION} post-install: Index: graphics/py3-cairo/distinfo =================================================================== --- graphics/py3-cairo/distinfo (révision 552077) +++ graphics/py3-cairo/distinfo (copie de travail) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560185779 -SHA256 (pycairo-1.18.1.tar.gz) = 70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786 -SIZE (pycairo-1.18.1.tar.gz) = 200610 +TIMESTAMP = 1602450182 +SHA256 (pycairo-1.20.0.tar.gz) = 5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c +SIZE (pycairo-1.20.0.tar.gz) = 344370 Index: graphics/py3-cairo/pkg-descr =================================================================== --- graphics/py3-cairo/pkg-descr (révision 552077) +++ graphics/py3-cairo/pkg-descr (copie de travail) @@ -1,3 +1,3 @@ -Python 2 bindings for Cairo. +Python bindings for Cairo. WWW: https://github.com/pygobject/pycairo Index: graphics/py3-cairo/pkg-plist =================================================================== --- graphics/py3-cairo/pkg-plist (révision 552077) +++ graphics/py3-cairo/pkg-plist (copie de travail) @@ -1,16 +1,13 @@ -%%PYTHON2%%include/pycairo/pycairo.h -%%PYTHON3%%include/pycairo/py3cairo.h +include/pycairo/py3cairo.h %%PYTHON_SITELIBDIR%%/cairo/__init__.py %%PYTHON_SITELIBDIR%%/cairo/__init__.pyc %%PYTHON_SITELIBDIR%%/cairo/__init__.pyi %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo %%PYTHON_SITELIBDIR%%/cairo/_cairo.so -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cairo/include/pycairo.h -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/cairo/include/py3cairo.h +%%PYTHON_SITELIBDIR%%/cairo/include/py3cairo.h %%PYTHON_SITELIBDIR%%/cairo/py.typed %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt %%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt -%%PYTHON2%%libdata/pkgconfig/pycairo.pc -%%PYTHON3%%libdata/pkgconfig/py3cairo.pc +libdata/pkgconfig/py3cairo.pc Index: graphics/variety/Makefile =================================================================== --- graphics/variety/Makefile (révision 552077) +++ graphics/variety/Makefile (copie de travail) @@ -3,6 +3,7 @@ PORTNAME= variety PORTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= nivit@FreeBSD.org @@ -16,7 +17,7 @@ libnotify.so:devel/libnotify RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${PY_FLAVOR} \ Index: multimedia/pitivi/Makefile =================================================================== --- multimedia/pitivi/Makefile (révision 552077) +++ multimedia/pitivi/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= pitivi PORTVERSION= 0.999 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= GNOME @@ -16,7 +16,7 @@ itstool:textproc/itstool LIB_DEPENDS= libgsttranscoder-1.0.so:multimedia/gstreamer1-transcoder RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.14.0:multimedia/py-gstreamer1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYNUMPY} Index: net-im/gajim/Makefile =================================================================== --- net-im/gajim/Makefile (révision 552077) +++ net-im/gajim/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= gajim DISTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= https://gajim.org/downloads/1.1/ @@ -19,7 +19,7 @@ ${PYTHON_PKGNAMEPREFIX}precis_i18n>=1.0.0:textproc/py-precis_i18n@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.12:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} USES= cpe dos2unix gettext gnome python:3.5+ tar:bzip2 xorg Index: print/py-weasyprint/Makefile =================================================================== --- print/py-weasyprint/Makefile (révision 552077) +++ print/py-weasyprint/Makefile (copie de travail) @@ -3,6 +3,7 @@ PORTNAME= weasyprint PORTVERSION= 51 +PORTREVISION= 1 CATEGORIES= print python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +15,7 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0.1:devel/py-pytest-runner@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.15.4:graphics/py-cairo@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.15.4:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairocffi>=0.9.0:graphics/py-cairocffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairosvg>=2.4.0:graphics/py-cairosvg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi@${PY_FLAVOR} \ Index: www/py-graphite-web/Makefile =================================================================== --- www/py-graphite-web/Makefile (révision 552077) +++ www/py-graphite-web/Makefile (copie de travail) @@ -3,6 +3,7 @@ PORTNAME= graphite-web PORTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py3-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.4.2:www/py-django-tagging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django22>=1.8<3.1:www/py-django22@${PY_FLAVOR} \ Index: www/twms/Makefile =================================================================== --- www/twms/Makefile (révision 552077) +++ www/twms/Makefile (copie de travail) @@ -3,7 +3,7 @@ PORTNAME= twms PORTVERSION= 0.06y -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www astro MAINTAINER= amdmi3@FreeBSD.org @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webpy>0:www/webpy@${PY_FLAVOR} \ ${PY_PILLOW} \ - ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py3-cairo@${PY_FLAVOR} \ ${FREESANS}:x11-fonts/freefont-ttf USE_GITHUB= yes Index: x11-themes/plasma5-breeze-gtk/Makefile =================================================================== --- x11-themes/plasma5-breeze-gtk/Makefile (révision 552077) +++ x11-themes/plasma5-breeze-gtk/Makefile (copie de travail) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= breeze-gtk +PORTREVISION= 1 DISTVERSION= ${KDE_PLASMA_VERSION} CATEGORIES= x11-themes kde kde-plasma @@ -10,9 +11,9 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LIB -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py3-cairo@${PY_FLAVOR} \ sassc:textproc/sassc -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py3-cairo@${PY_FLAVOR} USES= cmake compiler:c++11-lang cpe gnome kde:5 pkgconfig \ python:3.4+ qt:5 tar:xz