pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: fix py-cairo/py-cairo118 dependencies
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Thu Sep 3 17:48:40 2020 +0200
Changeset: 396435662b357af8d1d2c8944d69980a39c92e46
Modified Files:
TODO
arista/Makefile
catfish/PLIST
gtg/Makefile
microtetris/Makefile
monajat/Makefile
printrun/Makefile
py-carbon/PLIST
py-gaphas/Makefile
py-graphite-web/Makefile
py-graphite-web/PLIST
py-igraph/Makefile
py-oasa/Makefile
py-oasa/PLIST
py-openastro/Makefile
py-whisper/PLIST
py-xpra/Makefile
songwrite2/Makefile
Log Message:
*: fix py-cairo/py-cairo118 dependencies
Fix other problems encountered while here.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=396435662b357af8d1d2c8944d69980a39c92e46
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
TODO | 1 +
arista/Makefile | 2 +-
catfish/PLIST | 53 ++++++++--------
gtg/Makefile | 6 +-
microtetris/Makefile | 2 +-
monajat/Makefile | 2 +-
printrun/Makefile | 2 +-
py-carbon/PLIST | 156 +++++++++++++++++++++++------------------------
py-gaphas/Makefile | 2 +-
py-graphite-web/Makefile | 6 +-
py-graphite-web/PLIST | 6 +-
py-igraph/Makefile | 3 +-
py-oasa/Makefile | 8 +--
py-oasa/PLIST | 3 +-
py-openastro/Makefile | 2 +-
py-whisper/PLIST | 9 ++-
py-xpra/Makefile | 2 +-
songwrite2/Makefile | 2 +-
18 files changed, 142 insertions(+), 125 deletions(-)
diffs:
diff --git a/TODO b/TODO
index e90fdff682..792cdd90dd 100644
--- a/TODO
+++ b/TODO
@@ -52,6 +52,7 @@ Suggested package updates
o grass-7.0
o grisbi-0.8.4
o grsync-1.2.0
+ o gtg-0.4
o gtkaml-0.4.3
o guichan-0.8.1
o guile30-3.0.4
diff --git a/arista/Makefile b/arista/Makefile
index 6d9ac2b2c5..5dbd61e8fa 100644
--- a/arista/Makefile
+++ b/arista/Makefile
@@ -11,7 +11,7 @@ LICENSE= gnu-lgpl-v2
DEPENDS+= gst-ffmpeg-[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg
DEPENDS+= gst-plugins0.10-x264-[0-9]*:../../multimedia/gst-plugins0.10-x264
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool msgfmt
diff --git a/catfish/PLIST b/catfish/PLIST
index 5967ded4c8..8611aa9216 100644
--- a/catfish/PLIST
+++ b/catfish/PLIST
@@ -1,45 +1,48 @@
@comment $NetBSD$
bin/catfish
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
${PYSITELIB}/catfish/AboutCatfishDialog.py
-${PYSITELIB}/catfish/CatfishSearchEngine.py
-${PYSITELIB}/catfish/CatfishWindow.py
-${PYSITELIB}/catfish/__init__.py
-${PYSITELIB}/catfish/AboutCatfishDialog.pyo
${PYSITELIB}/catfish/AboutCatfishDialog.pyc
-${PYSITELIB}/catfish/CatfishSearchEngine.pyo
+${PYSITELIB}/catfish/AboutCatfishDialog.pyo
+${PYSITELIB}/catfish/CatfishSearchEngine.py
${PYSITELIB}/catfish/CatfishSearchEngine.pyc
-${PYSITELIB}/catfish/CatfishWindow.pyo
+${PYSITELIB}/catfish/CatfishSearchEngine.pyo
+${PYSITELIB}/catfish/CatfishWindow.py
${PYSITELIB}/catfish/CatfishWindow.pyc
-${PYSITELIB}/catfish/__init__.pyo
+${PYSITELIB}/catfish/CatfishWindow.pyo
+${PYSITELIB}/catfish/__init__.py
${PYSITELIB}/catfish/__init__.pyc
+${PYSITELIB}/catfish/__init__.pyo
${PYSITELIB}/catfish_lib/AboutDialog.py
-${PYSITELIB}/catfish_lib/Builder.py
-${PYSITELIB}/catfish_lib/CatfishSettings.py
-${PYSITELIB}/catfish_lib/SudoDialog.py
-${PYSITELIB}/catfish_lib/Thumbnailer.py
-${PYSITELIB}/catfish_lib/Window.py
-${PYSITELIB}/catfish_lib/__init__.py
-${PYSITELIB}/catfish_lib/AboutDialog.pyo
${PYSITELIB}/catfish_lib/AboutDialog.pyc
-${PYSITELIB}/catfish_lib/Builder.pyo
+${PYSITELIB}/catfish_lib/AboutDialog.pyo
+${PYSITELIB}/catfish_lib/Builder.py
${PYSITELIB}/catfish_lib/Builder.pyc
-${PYSITELIB}/catfish_lib/CatfishSettings.pyo
+${PYSITELIB}/catfish_lib/Builder.pyo
+${PYSITELIB}/catfish_lib/CatfishSettings.py
${PYSITELIB}/catfish_lib/CatfishSettings.pyc
-${PYSITELIB}/catfish_lib/SudoDialog.pyo
+${PYSITELIB}/catfish_lib/CatfishSettings.pyo
+${PYSITELIB}/catfish_lib/SudoDialog.py
${PYSITELIB}/catfish_lib/SudoDialog.pyc
-${PYSITELIB}/catfish_lib/Thumbnailer.pyo
+${PYSITELIB}/catfish_lib/SudoDialog.pyo
+${PYSITELIB}/catfish_lib/Thumbnailer.py
${PYSITELIB}/catfish_lib/Thumbnailer.pyc
-${PYSITELIB}/catfish_lib/Window.pyo
+${PYSITELIB}/catfish_lib/Thumbnailer.pyo
+${PYSITELIB}/catfish_lib/Window.py
${PYSITELIB}/catfish_lib/Window.pyc
-${PYSITELIB}/catfish_lib/__init__.pyo
+${PYSITELIB}/catfish_lib/Window.pyo
+${PYSITELIB}/catfish_lib/__init__.py
${PYSITELIB}/catfish_lib/__init__.pyc
-${PYSITELIB}/catfish_lib/catfishconfig.pyo
-${PYSITELIB}/catfish_lib/catfishconfig.pyc
-${PYSITELIB}/catfish_lib/helpers.pyo
-${PYSITELIB}/catfish_lib/helpers.pyc
+${PYSITELIB}/catfish_lib/__init__.pyo
${PYSITELIB}/catfish_lib/catfishconfig.py
+${PYSITELIB}/catfish_lib/catfishconfig.pyc
+${PYSITELIB}/catfish_lib/catfishconfig.pyo
${PYSITELIB}/catfish_lib/helpers.py
+${PYSITELIB}/catfish_lib/helpers.pyc
+${PYSITELIB}/catfish_lib/helpers.pyo
man/man1/catfish.1
share/applications/org.xfce.Catfish.desktop
share/catfish/ui/AboutCatfishDialog.ui
diff --git a/gtg/Makefile b/gtg/Makefile
index 3ce7a2e63c..6f1b805636 100644
--- a/gtg/Makefile
+++ b/gtg/Makefile
@@ -3,16 +3,16 @@
DISTNAME= gtg-0.1.1
PKGREVISION= 1
CATEGORIES= editors python
-MASTER_SITES= http://launchpad.net/gtg/trunk/0.1.1/+download/
+#MASTER_SITES= http://launchpad.net/gtg/trunk/0.1.1/+download/
MAINTAINER= pkgsrc.gnome%gmail.com@localhost
-HOMEPAGE= http://gtg.fritalk.com/
+HOMEPAGE= https://flathub.org/apps/details/org.gnome.GTG
COMMENT= GTG is a personal organizer for the GNOME
LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-xdg>=0.17:../../devel/py-xdg
DEPENDS+= ${PYPKGPREFIX}-configobj>=4.6.0:../../devel/py-configobj
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool msgfmt
diff --git a/microtetris/Makefile b/microtetris/Makefile
index 303a26da72..93633a4a44 100644
--- a/microtetris/Makefile
+++ b/microtetris/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users%netbsd.org@localhost
HOMEPAGE= http://microtetris.sourceforge.net/
COMMENT= MicroTetris is a simple and compact popular game Tetris
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
diff --git a/monajat/Makefile b/monajat/Makefile
index e8cfa3b9d1..c0d1ba3c3a 100644
--- a/monajat/Makefile
+++ b/monajat/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_TOOLS+= intltool msgfmt
diff --git a/printrun/Makefile b/printrun/Makefile
index 0b6ed05bfb..75558903df 100644
--- a/printrun/Makefile
+++ b/printrun/Makefile
@@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-readline>=1.0:../../devel/py-readline
DEPENDS+= ${PYPKGPREFIX}-serial>=2.6:../../comms/py-serial
DEPENDS+= ${PYPKGPREFIX}-numpy>=1.8.2:../../math/py-numpy
DEPENDS+= ${PYPKGPREFIX}-pyglet>=1.1:../../wip/py-pyglet
-DEPENDS+= ${PYPKGPREFIX}-cairo>=1.8.8:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo>=1.8.8:../../graphics/py-cairo118
DEPENDS+= ${PYPKGPREFIX}-cairosvg>=1.0.9:../../converters/py27-cairosvg
#Meh linux sleep thing same with the dbus req.
#DEPENDS+= ${PYPKGPREFIX}-psutil>=5.2.2:../../sysutils/py-psutil
diff --git a/py-carbon/PLIST b/py-carbon/PLIST
index f8f0d9ad88..9534a042a4 100644
--- a/py-carbon/PLIST
+++ b/py-carbon/PLIST
@@ -5,119 +5,124 @@ bin/carbon-cache.py
bin/carbon-client.py
bin/carbon-relay.py
bin/validate-storage-schemas.py
-${PYSITELIB}/${EGG_FILE}
+${PLIST.py2x}${PYSITELIB}/${EGG_FILE}
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/top_level.txt
${PYSITELIB}/carbon/__init__.py
-${PYSITELIB}/carbon/__init__.pyo
${PYSITELIB}/carbon/__init__.pyc
-${PYSITELIB}/carbon/amqp_listener.pyo
-${PYSITELIB}/carbon/amqp_listener.pyc
-${PYSITELIB}/carbon/amqp_publisher.pyo
-${PYSITELIB}/carbon/amqp_publisher.pyc
-${PYSITELIB}/carbon/cache.pyo
-${PYSITELIB}/carbon/cache.pyc
-${PYSITELIB}/carbon/carbon_pb2.pyo
-${PYSITELIB}/carbon/carbon_pb2.pyc
-${PYSITELIB}/carbon/client.pyo
-${PYSITELIB}/carbon/client.pyc
-${PYSITELIB}/carbon/conf.pyo
-${PYSITELIB}/carbon/conf.pyc
-${PYSITELIB}/carbon/database.pyo
-${PYSITELIB}/carbon/database.pyc
-${PYSITELIB}/carbon/events.pyo
-${PYSITELIB}/carbon/events.pyc
-${PYSITELIB}/carbon/exceptions.pyo
-${PYSITELIB}/carbon/exceptions.pyc
-${PYSITELIB}/carbon/hashing.pyo
-${PYSITELIB}/carbon/hashing.pyc
-${PYSITELIB}/carbon/http.pyo
-${PYSITELIB}/carbon/http.pyc
-${PYSITELIB}/carbon/instrumentation.pyo
-${PYSITELIB}/carbon/instrumentation.pyc
-${PYSITELIB}/carbon/log.pyo
-${PYSITELIB}/carbon/log.pyc
-${PYSITELIB}/carbon/management.pyo
-${PYSITELIB}/carbon/management.pyc
-${PYSITELIB}/carbon/manhole.pyo
-${PYSITELIB}/carbon/manhole.pyc
-${PYSITELIB}/carbon/pipeline.pyo
-${PYSITELIB}/carbon/pipeline.pyc
-${PYSITELIB}/carbon/protobuf.pyo
-${PYSITELIB}/carbon/protobuf.pyc
-${PYSITELIB}/carbon/protocols.pyo
-${PYSITELIB}/carbon/protocols.pyc
-${PYSITELIB}/carbon/regexlist.pyo
-${PYSITELIB}/carbon/regexlist.pyc
-${PYSITELIB}/carbon/relayrules.pyo
-${PYSITELIB}/carbon/relayrules.pyc
-${PYSITELIB}/carbon/resolver.pyo
-${PYSITELIB}/carbon/resolver.pyc
-${PYSITELIB}/carbon/rewrite.pyo
-${PYSITELIB}/carbon/rewrite.pyc
-${PYSITELIB}/carbon/routers.pyo
-${PYSITELIB}/carbon/routers.pyc
-${PYSITELIB}/carbon/service.pyo
-${PYSITELIB}/carbon/service.pyc
-${PYSITELIB}/carbon/state.pyo
-${PYSITELIB}/carbon/state.pyc
-${PYSITELIB}/carbon/storage.pyo
-${PYSITELIB}/carbon/storage.pyc
-${PYSITELIB}/carbon/util.pyo
-${PYSITELIB}/carbon/util.pyc
-${PYSITELIB}/carbon/writer.pyo
-${PYSITELIB}/carbon/writer.pyc
+${PYSITELIB}/carbon/__init__.pyo
${PYSITELIB}/carbon/aggregator/__init__.py
-${PYSITELIB}/carbon/aggregator/__init__.pyo
${PYSITELIB}/carbon/aggregator/__init__.pyc
-${PYSITELIB}/carbon/aggregator/buffers.pyo
-${PYSITELIB}/carbon/aggregator/buffers.pyc
-${PYSITELIB}/carbon/aggregator/processor.pyo
-${PYSITELIB}/carbon/aggregator/processor.pyc
-${PYSITELIB}/carbon/aggregator/rules.pyo
-${PYSITELIB}/carbon/aggregator/rules.pyc
+${PYSITELIB}/carbon/aggregator/__init__.pyo
${PYSITELIB}/carbon/aggregator/buffers.py
+${PYSITELIB}/carbon/aggregator/buffers.pyc
+${PYSITELIB}/carbon/aggregator/buffers.pyo
${PYSITELIB}/carbon/aggregator/processor.py
+${PYSITELIB}/carbon/aggregator/processor.pyc
+${PYSITELIB}/carbon/aggregator/processor.pyo
${PYSITELIB}/carbon/aggregator/rules.py
+${PYSITELIB}/carbon/aggregator/rules.pyc
+${PYSITELIB}/carbon/aggregator/rules.pyo
${PYSITELIB}/carbon/amqp0-8.xml
${PYSITELIB}/carbon/amqp_listener.py
+${PYSITELIB}/carbon/amqp_listener.pyc
+${PYSITELIB}/carbon/amqp_listener.pyo
${PYSITELIB}/carbon/amqp_publisher.py
+${PYSITELIB}/carbon/amqp_publisher.pyc
+${PYSITELIB}/carbon/amqp_publisher.pyo
${PYSITELIB}/carbon/cache.py
+${PYSITELIB}/carbon/cache.pyc
+${PYSITELIB}/carbon/cache.pyo
${PYSITELIB}/carbon/carbon_pb2.py
+${PYSITELIB}/carbon/carbon_pb2.pyc
+${PYSITELIB}/carbon/carbon_pb2.pyo
${PYSITELIB}/carbon/client.py
+${PYSITELIB}/carbon/client.pyc
+${PYSITELIB}/carbon/client.pyo
${PYSITELIB}/carbon/conf.py
+${PYSITELIB}/carbon/conf.pyc
+${PYSITELIB}/carbon/conf.pyo
${PYSITELIB}/carbon/database.py
+${PYSITELIB}/carbon/database.pyc
+${PYSITELIB}/carbon/database.pyo
${PYSITELIB}/carbon/events.py
+${PYSITELIB}/carbon/events.pyc
+${PYSITELIB}/carbon/events.pyo
${PYSITELIB}/carbon/exceptions.py
+${PYSITELIB}/carbon/exceptions.pyc
+${PYSITELIB}/carbon/exceptions.pyo
${PYSITELIB}/carbon/hashing.py
+${PYSITELIB}/carbon/hashing.pyc
+${PYSITELIB}/carbon/hashing.pyo
${PYSITELIB}/carbon/http.py
+${PYSITELIB}/carbon/http.pyc
+${PYSITELIB}/carbon/http.pyo
${PYSITELIB}/carbon/instrumentation.py
+${PYSITELIB}/carbon/instrumentation.pyc
+${PYSITELIB}/carbon/instrumentation.pyo
${PYSITELIB}/carbon/log.py
+${PYSITELIB}/carbon/log.pyc
+${PYSITELIB}/carbon/log.pyo
${PYSITELIB}/carbon/management.py
+${PYSITELIB}/carbon/management.pyc
+${PYSITELIB}/carbon/management.pyo
${PYSITELIB}/carbon/manhole.py
+${PYSITELIB}/carbon/manhole.pyc
+${PYSITELIB}/carbon/manhole.pyo
${PYSITELIB}/carbon/pipeline.py
+${PYSITELIB}/carbon/pipeline.pyc
+${PYSITELIB}/carbon/pipeline.pyo
${PYSITELIB}/carbon/protobuf.py
+${PYSITELIB}/carbon/protobuf.pyc
+${PYSITELIB}/carbon/protobuf.pyo
${PYSITELIB}/carbon/protocols.py
+${PYSITELIB}/carbon/protocols.pyc
+${PYSITELIB}/carbon/protocols.pyo
${PYSITELIB}/carbon/regexlist.py
+${PYSITELIB}/carbon/regexlist.pyc
+${PYSITELIB}/carbon/regexlist.pyo
${PYSITELIB}/carbon/relayrules.py
+${PYSITELIB}/carbon/relayrules.pyc
+${PYSITELIB}/carbon/relayrules.pyo
${PYSITELIB}/carbon/resolver.py
+${PYSITELIB}/carbon/resolver.pyc
+${PYSITELIB}/carbon/resolver.pyo
${PYSITELIB}/carbon/rewrite.py
+${PYSITELIB}/carbon/rewrite.pyc
+${PYSITELIB}/carbon/rewrite.pyo
${PYSITELIB}/carbon/routers.py
+${PYSITELIB}/carbon/routers.pyc
+${PYSITELIB}/carbon/routers.pyo
${PYSITELIB}/carbon/service.py
+${PYSITELIB}/carbon/service.pyc
+${PYSITELIB}/carbon/service.pyo
${PYSITELIB}/carbon/state.py
+${PYSITELIB}/carbon/state.pyc
+${PYSITELIB}/carbon/state.pyo
${PYSITELIB}/carbon/storage.py
+${PYSITELIB}/carbon/storage.pyc
+${PYSITELIB}/carbon/storage.pyo
${PYSITELIB}/carbon/util.py
+${PYSITELIB}/carbon/util.pyc
+${PYSITELIB}/carbon/util.pyo
${PYSITELIB}/carbon/writer.py
-${PYSITELIB}/twisted/plugins/carbon_aggregator_cache_plugin.pyo
-${PYSITELIB}/twisted/plugins/carbon_aggregator_cache_plugin.pyc
-${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.pyo
-${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.pyc
-${PYSITELIB}/twisted/plugins/carbon_cache_plugin.pyo
-${PYSITELIB}/twisted/plugins/carbon_cache_plugin.pyc
-${PYSITELIB}/twisted/plugins/carbon_relay_plugin.pyo
-${PYSITELIB}/twisted/plugins/carbon_relay_plugin.pyc
+${PYSITELIB}/carbon/writer.pyc
+${PYSITELIB}/carbon/writer.pyo
${PYSITELIB}/twisted/plugins/carbon_aggregator_cache_plugin.py
+${PYSITELIB}/twisted/plugins/carbon_aggregator_cache_plugin.pyc
+${PYSITELIB}/twisted/plugins/carbon_aggregator_cache_plugin.pyo
${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.py
+${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.pyc
+${PYSITELIB}/twisted/plugins/carbon_aggregator_plugin.pyo
${PYSITELIB}/twisted/plugins/carbon_cache_plugin.py
+${PYSITELIB}/twisted/plugins/carbon_cache_plugin.pyc
+${PYSITELIB}/twisted/plugins/carbon_cache_plugin.pyo
${PYSITELIB}/twisted/plugins/carbon_relay_plugin.py
+${PYSITELIB}/twisted/plugins/carbon_relay_plugin.pyc
+${PYSITELIB}/twisted/plugins/carbon_relay_plugin.pyo
share/examples/graphite/aggregation-rules.conf.example
share/examples/graphite/blacklist.conf.example
share/examples/graphite/carbon.amqp.conf.example
@@ -127,8 +132,3 @@ share/examples/graphite/rewrite-rules.conf.example
share/examples/graphite/storage-aggregation.conf.example
share/examples/graphite/storage-schemas.conf.example
share/examples/graphite/whitelist.conf.example
-@pkgdir var/graphite/whisper/dummy.txt
-@pkgdir var/graphite/rrd/dummy.txt
-@pkgdir var/graphite/log/dummy.txt
-@pkgdir var/graphite/lists
-@pkgdir var/graphite/ceres/dummy.txt
diff --git a/py-gaphas/Makefile b/py-gaphas/Makefile
index 08910f3c8b..c880cc1c78 100644
--- a/py-gaphas/Makefile
+++ b/py-gaphas/Makefile
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2
DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.0:../../devel/py-nose
DEPENDS+= ${PYPKGPREFIX}-decorator>=3.2.0:../../devel/py-decorator
DEPENDS+= ${PYPKGPREFIX}-simplegeneric>=0.8.1:../../wip/py-simplegeneric
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
diff --git a/py-graphite-web/Makefile b/py-graphite-web/Makefile
index cd73eb306d..c33bbf600a 100644
--- a/py-graphite-web/Makefile
+++ b/py-graphite-web/Makefile
@@ -16,7 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-django>=1.3.1:../../www/py-django
DEPENDS+= ${PYPKGPREFIX}-django-tagging>=0.3.1:../../www/py-django-tagging
DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
+PYTHON_VERSIONED_DEPENDENCIES+= cairo
EGG_NAME= ${DISTNAME:S/graphite-/graphite_/}
@@ -73,5 +74,6 @@ post-install:
${LN} -s ${PKG_SYSCONFDIR}/local_settings.py ${DESTDIR}${PREFIX}/${PYSITELIB}/graphite/
.include "../../databases/py-carbon/Makefile.common"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-graphite-web/PLIST b/py-graphite-web/PLIST
index eb948c66e2..5398c7ccfa 100644
--- a/py-graphite-web/PLIST
+++ b/py-graphite-web/PLIST
@@ -675,7 +675,11 @@ ${PYSITELIB}/graphite/worker_pool/pool.pyo
${PYSITELIB}/graphite/worker_pool/pool.pyc
${PYSITELIB}/graphite/worker_pool/pool.py
${PYSITELIB}/graphite/wsgi.py
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
share/examples/graphite/dashboard.conf.example
share/examples/graphite/example-client.py
share/examples/graphite/example-graphite-vhost.conf
diff --git a/py-igraph/Makefile b/py-igraph/Makefile
index 06e52ab551..e0094b2555 100644
--- a/py-igraph/Makefile
+++ b/py-igraph/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE= https://igraph.org/
COMMENT= Manipulating Undirected and Directed Graphs for Python
LICENSE= gnu-gpl-v2
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+PYTHON_VERSIONED_DEPENDENCIES+= cairo
USE_TOOLS+= pkg-config
.include "../../lang/python/egg.mk"
.include "../../wip/igraph/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-oasa/Makefile b/py-oasa/Makefile
index 0209a424fb..82e3ae2d3b 100644
--- a/py-oasa/Makefile
+++ b/py-oasa/Makefile
@@ -10,14 +10,14 @@ HOMEPAGE= http://bkchem.zirael.org/download/
COMMENT= Python library for manipulation of chemical formats
LICENSE= gnu-gpl-v2
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
-USE_LANGUAGES= # none
+PYTHON_VERSIONS_ACCEPTED= 27
-PYDISTUTILSPKG= yes
+USE_LANGUAGES= # none
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} test.py
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-oasa/PLIST b/py-oasa/PLIST
index 7395b49229..965cdceec1 100644
--- a/py-oasa/PLIST
+++ b/py-oasa/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/09 21:37:34 jihbed Exp $
+@comment $NetBSD$
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/oasa/__init__.py
${PYSITELIB}/oasa/__init__.pyc
${PYSITELIB}/oasa/__init__.pyo
diff --git a/py-openastro/Makefile b/py-openastro/Makefile
index 7a548ad943..88bc7f50e4 100644
--- a/py-openastro/Makefile
+++ b/py-openastro/Makefile
@@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v3
BROKEN= Needs to be updated to a version that does not use py-gnome2-desktop.
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
PYTHON_VERSIONS_ACCEPTED= 27 # py-ORBit via py-gnome2, py-gtk2
diff --git a/py-whisper/PLIST b/py-whisper/PLIST
index 7c3f5ff8a4..5ce6e72a7f 100644
--- a/py-whisper/PLIST
+++ b/py-whisper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/07/07 04:56:45 minskim Exp $
+@comment $NetBSD$
bin/find-corrupt-whisper-files.py
bin/rrd2whisper.py
bin/update-storage-times.py
@@ -15,7 +15,12 @@ bin/whisper-resize.py
bin/whisper-set-aggregation-method.py
bin/whisper-set-xfilesfactor.py
bin/whisper-update.py
-${PYSITELIB}/${EGG_FILE}
+${PLIST.py2x}${PYSITELIB}/${EGG_FILE}
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/top_level.txt
${PYSITELIB}/whisper.py
${PYSITELIB}/whisper.pyc
${PYSITELIB}/whisper.pyo
diff --git a/py-xpra/Makefile b/py-xpra/Makefile
index 67e4f122c2..79b2aa0ff3 100644
--- a/py-xpra/Makefile
+++ b/py-xpra/Makefile
@@ -12,7 +12,7 @@ COMMENT= screen(1) for X
LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-cython>=0.14:../../devel/py-cython
-#DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+#DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
diff --git a/songwrite2/Makefile b/songwrite2/Makefile
index 1ad08d980c..309260dad3 100644
--- a/songwrite2/Makefile
+++ b/songwrite2/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://home.gna.org/oomadness/en/songwrite/
COMMENT= Music score and songbook editor
LICENSE= gnu-gpl-v3
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= # none
Home |
Main Index |
Thread Index |
Old Index