CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 3 Sep 2020 15:46:07 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep  3 15:46:06 UTC 2020

Modified Files:
        pkgsrc/audio/playitslowly: Makefile
        pkgsrc/devel/bzr-gtk: Makefile
        pkgsrc/devel/meld: Makefile
        pkgsrc/devel/py-configobj: Makefile PLIST
        pkgsrc/devel/py-gobject: Makefile
        pkgsrc/www/py-graphite-web: Makefile

Log Message:
*: fix py-cairo/py-cairo118 dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/playitslowly/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/bzr-gtk/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-configobj/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-configobj/PLIST
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/py-gobject/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/py-graphite-web/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/playitslowly/Makefile
diff -u pkgsrc/audio/playitslowly/Makefile:1.10 pkgsrc/audio/playitslowly/Makefile:1.11
--- pkgsrc/audio/playitslowly/Makefile:1.10     Wed Sep  2 21:42:47 2020
+++ pkgsrc/audio/playitslowly/Makefile  Thu Sep  3 15:46:06 2020
@@ -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 @@ LICENSE=      gnu-gpl-v3
 
 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 @@ USE_LANGUAGES=        # none
 .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"

Index: pkgsrc/devel/bzr-gtk/Makefile
diff -u pkgsrc/devel/bzr-gtk/Makefile:1.30 pkgsrc/devel/bzr-gtk/Makefile:1.31
--- pkgsrc/devel/bzr-gtk/Makefile:1.30  Mon May 18 06:09:40 2020
+++ pkgsrc/devel/bzr-gtk/Makefile       Thu Sep  3 15:46:06 2020
@@ -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 @@ COMMENT=      Various GTK+ frontends to Bazaa
 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

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.107 pkgsrc/devel/meld/Makefile:1.108
--- pkgsrc/devel/meld/Makefile:1.107    Wed Sep  2 21:42:48 2020
+++ pkgsrc/devel/meld/Makefile  Thu Sep  3 15:46:06 2020
@@ -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 @@ EXTRACT_SUFX=           .tar.xz
 
 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

Index: pkgsrc/devel/py-configobj/Makefile
diff -u pkgsrc/devel/py-configobj/Makefile:1.5 pkgsrc/devel/py-configobj/Makefile:1.6
--- pkgsrc/devel/py-configobj/Makefile:1.5      Wed Sep  2 18:12:29 2020
+++ pkgsrc/devel/py-configobj/Makefile  Thu Sep  3 15:46:06 2020
@@ -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 @@ DEPENDS+=     ${PYPKGPREFIX}-six-[0-9]*:../.
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-configobj/PLIST
diff -u pkgsrc/devel/py-configobj/PLIST:1.2 pkgsrc/devel/py-configobj/PLIST:1.3
--- pkgsrc/devel/py-configobj/PLIST:1.2 Wed Sep  2 18:12:29 2020
+++ pkgsrc/devel/py-configobj/PLIST     Thu Sep  3 15:46:06 2020
@@ -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

Index: pkgsrc/devel/py-gobject/Makefile
diff -u pkgsrc/devel/py-gobject/Makefile:1.58 pkgsrc/devel/py-gobject/Makefile:1.59
--- pkgsrc/devel/py-gobject/Makefile:1.58       Sun Mar  8 16:47:41 2020
+++ pkgsrc/devel/py-gobject/Makefile    Thu Sep  3 15:46:06 2020
@@ -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 @@ CONFIGURE_ARGS+=      --disable-introspection
 .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"

Index: pkgsrc/www/py-graphite-web/Makefile
diff -u pkgsrc/www/py-graphite-web/Makefile:1.8 pkgsrc/www/py-graphite-web/Makefile:1.9
--- pkgsrc/www/py-graphite-web/Makefile:1.8     Mon Nov  4 22:10:12 2019
+++ pkgsrc/www/py-graphite-web/Makefile Thu Sep  3 15:46:06 2020
@@ -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>=1.3.1:.
 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_/}

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/mail/thunderbird-l10n
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/mail/thunderbird-l10n
Indexes:

Home | Main Index | Thread Index | Old Index