Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: fix py-cairo/py-cairo118 dependencies
details: https://anonhg.NetBSD.org/pkgsrc/rev/28adae84ddcf
branches: trunk
changeset: 437950:28adae84ddcf
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Sep 03 15:46:06 2020 +0000
description:
*: fix py-cairo/py-cairo118 dependencies
diffstat:
audio/playitslowly/Makefile | 6 ++++--
devel/bzr-gtk/Makefile | 4 ++--
devel/meld/Makefile | 4 ++--
devel/py-configobj/Makefile | 4 ++--
devel/py-configobj/PLIST | 13 +++++++------
devel/py-gobject/Makefile | 5 +++--
www/py-graphite-web/Makefile | 4 ++--
7 files changed, 22 insertions(+), 18 deletions(-)
diffs (139 lines):
diff -r 998ad6cf08c9 -r 28adae84ddcf audio/playitslowly/Makefile
--- a/audio/playitslowly/Makefile Thu Sep 03 15:45:22 2020 +0000
+++ b/audio/playitslowly/Makefile Thu Sep 03 15:46:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/02 21:42:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2020/09/03 15:46:06 wiz Exp $
DISTNAME= playitslowly-1.5.1
PKGREVISION= 2
@@ -12,7 +12,8 @@
DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1
DEPENDS+= gst-plugins1-soundtouch-[0-9]*:../../audio/gst-plugins1-soundtouch
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
+PYTHON_VERSIONED_DEPENDENCIES+= cairo
REPLACE_PYTHON+= playitslowly/app.py
@@ -28,4 +29,5 @@
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 998ad6cf08c9 -r 28adae84ddcf devel/bzr-gtk/Makefile
--- a/devel/bzr-gtk/Makefile Thu Sep 03 15:45:22 2020 +0000
+++ b/devel/bzr-gtk/Makefile Thu Sep 03 15:46:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2020/05/18 06:09:40 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2020/09/03 15:46:06 wiz Exp $
DISTNAME= bzr-gtk-${VER}
PKGREVISION= 2
@@ -12,7 +12,7 @@
LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
PYDISTUTILSPKG= yes
PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
diff -r 998ad6cf08c9 -r 28adae84ddcf devel/meld/Makefile
--- a/devel/meld/Makefile Thu Sep 03 15:45:22 2020 +0000
+++ b/devel/meld/Makefile Thu Sep 03 15:46:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2020/09/02 21:42:48 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2020/09/03 15:46:06 wiz Exp $
DISTNAME= meld-3.21.0
PKGREVISION= 5
@@ -8,7 +8,7 @@
MAINTAINER= wiz%NetBSD.org@localhost
HOMEPAGE= https://meldmerge.org/
-COMMENT= Visual diff and merge tool (GTK3 version)
+COMMENT= Visual diff and merge tool
LICENSE= gnu-gpl-v2
BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
diff -r 998ad6cf08c9 -r 28adae84ddcf devel/py-configobj/Makefile
--- a/devel/py-configobj/Makefile Thu Sep 03 15:45:22 2020 +0000
+++ b/devel/py-configobj/Makefile Thu Sep 03 15:46:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/09/02 18:12:29 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2020/09/03 15:46:06 wiz Exp $
DISTNAME= configobj-5.0.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -15,5 +15,5 @@
USE_LANGUAGES= # none
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 998ad6cf08c9 -r 28adae84ddcf devel/py-configobj/PLIST
--- a/devel/py-configobj/PLIST Thu Sep 03 15:45:22 2020 +0000
+++ b/devel/py-configobj/PLIST Thu Sep 03 15:46:06 2020 +0000
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2020/09/02 18:12:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/09/03 15:46:06 wiz Exp $
${PYSITELIB}/_version.py
${PYSITELIB}/_version.pyc
${PYSITELIB}/_version.pyo
-${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
+${PLIST.py2x}${PYSITELIB}/${EGG_FILE}
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/configobj.py
${PYSITELIB}/configobj.pyc
${PYSITELIB}/configobj.pyo
diff -r 998ad6cf08c9 -r 28adae84ddcf devel/py-gobject/Makefile
--- a/devel/py-gobject/Makefile Thu Sep 03 15:45:22 2020 +0000
+++ b/devel/py-gobject/Makefile Thu Sep 03 15:46:06 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2020/03/08 16:47:41 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2020/09/03 15:46:06 wiz Exp $
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
PKGREVISION= 2
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+PYTHON_VERSIONED_DEPENDENCIES+= cairo
.include "Makefile.common"
@@ -36,4 +36,5 @@
.include "../../devel/py-gobject-shared/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 998ad6cf08c9 -r 28adae84ddcf www/py-graphite-web/Makefile
--- a/www/py-graphite-web/Makefile Thu Sep 03 15:45:22 2020 +0000
+++ b/www/py-graphite-web/Makefile Thu Sep 03 15:46:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/04 22:10:12 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2020/09/03 15:46:06 wiz Exp $
DISTNAME= graphite-web-0.9.15
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@
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
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo118
EGG_NAME= ${DISTNAME:S/graphite-/graphite_/}
Home |
Main Index |
Thread Index |
Old Index