Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id F07811A9239 for ; Mon, 10 Jan 2022 22:46:05 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3451A84D93; Mon, 10 Jan 2022 22:46:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6D81084D66 for ; Mon, 10 Jan 2022 22:46:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wcSdRB5zn-yG for ; Mon, 10 Jan 2022 22:46:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BC62584D4C for ; Mon, 10 Jan 2022 22:46:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B430AFB24; Mon, 10 Jan 2022 22:46:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1641854763224800" MIME-Version: 1.0 Date: Mon, 10 Jan 2022 22:46:03 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/www/py-graphite-web To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220110224603.B430AFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1641854763224800 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Jan 10 22:46:03 UTC 2022 Modified Files: pkgsrc/www/py-graphite-web: Makefile PLIST distinfo pkgsrc/www/py-graphite-web/patches: patch-bin_build-index.sh Log Message: py-graphite-web: convert to egg.mk To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/py-graphite-web/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-graphite-web/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-graphite-web/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/www/py-graphite-web/patches/patch-bin_build-index.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1641854763224800 Content-Disposition: inline Content-Length: 3640 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/py-graphite-web/Makefile diff -u pkgsrc/www/py-graphite-web/Makefile:1.9 pkgsrc/www/py-graphite-web/Makefile:1.10 --- pkgsrc/www/py-graphite-web/Makefile:1.9 Thu Sep 3 15:46:06 2020 +++ pkgsrc/www/py-graphite-web/Makefile Mon Jan 10 22:46:03 2022 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2020/09/03 15:46:06 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2022/01/10 22:46:03 wiz Exp $ DISTNAME= graphite-web-0.9.15 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= www GITHUB_PROJECT= graphite-web MASTER_SITES= ${MASTER_SITE_GITHUB:=graphite-project/} @@ -60,7 +61,7 @@ CONF_FILES+= ${GRAPHITE_EGDIR}/${file}. .endfor PYSETUPINSTALLARGS= --prefix=${PREFIX} \ - --install-lib=${PREFIX}/${PYSITELIB} + --install-lib=${PREFIX}/${PYSITELIB} PYTHON_VERSIONS_ACCEPTED= 27 # py-django-tagging INSTALLATION_DIRS+= share/examples/graphite @@ -74,5 +75,5 @@ 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 "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-graphite-web/PLIST diff -u pkgsrc/www/py-graphite-web/PLIST:1.1 pkgsrc/www/py-graphite-web/PLIST:1.2 --- pkgsrc/www/py-graphite-web/PLIST:1.1 Fri Dec 11 21:45:07 2015 +++ pkgsrc/www/py-graphite-web/PLIST Mon Jan 10 22:46:03 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/12/11 21:45:07 riz Exp $ +@comment $NetBSD: PLIST,v 1.2 2022/01/10 22:46:03 wiz Exp $ bin/build-index.sh bin/run-graphite-devel-server.py graphite/webapp/content/css/cli.css @@ -756,7 +756,6 @@ ${PYSITELIB}/graphite/whitelist/urls.pyo ${PYSITELIB}/graphite/whitelist/views.py ${PYSITELIB}/graphite/whitelist/views.pyc ${PYSITELIB}/graphite/whitelist/views.pyo -${PYSITELIB}/${EGG_FILE} share/examples/graphite/dashboard.conf.example share/examples/graphite/example-client.py share/examples/graphite/example-graphite-vhost.conf Index: pkgsrc/www/py-graphite-web/distinfo diff -u pkgsrc/www/py-graphite-web/distinfo:1.3 pkgsrc/www/py-graphite-web/distinfo:1.4 --- pkgsrc/www/py-graphite-web/distinfo:1.3 Tue Oct 26 11:30:41 2021 +++ pkgsrc/www/py-graphite-web/distinfo Mon Jan 10 22:46:03 2022 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 11:30:41 nia Exp $ +$NetBSD: distinfo,v 1.4 2022/01/10 22:46:03 wiz Exp $ BLAKE2s (graphite-web-0.9.15.tar.gz) = 736a8e1b5bcd2cc4f2fea245fe53a7e9f9b4c3a6939b76e4ac47dfc073d6fe44 SHA512 (graphite-web-0.9.15.tar.gz) = 055c0cf3e98db56ecd37c8926f83f82b38f88edbe795d183967dfe5e09391a8a838265afef6e426686a8dfbddd8e2164e445ca007b3454ec674142bbf8f693e2 Size (graphite-web-0.9.15.tar.gz) = 2434438 bytes -SHA1 (patch-bin_build-index.sh) = 13ad11086c620bd65a7cf084a88ae0187fdae2d7 +SHA1 (patch-bin_build-index.sh) = 0373f48f64e254af25ab4b15747c18efafb3136c SHA1 (patch-setup.py) = 1f215025652d5d45302af8d13ee7ff7a91003cfc Index: pkgsrc/www/py-graphite-web/patches/patch-bin_build-index.sh diff -u pkgsrc/www/py-graphite-web/patches/patch-bin_build-index.sh:1.1 pkgsrc/www/py-graphite-web/patches/patch-bin_build-index.sh:1.2 --- pkgsrc/www/py-graphite-web/patches/patch-bin_build-index.sh:1.1 Fri Dec 11 21:45:07 2015 +++ pkgsrc/www/py-graphite-web/patches/patch-bin_build-index.sh Mon Jan 10 22:46:03 2022 @@ -1,6 +1,7 @@ -$NetBSD: patch-bin_build-index.sh,v 1.1 2015/12/11 21:45:07 riz Exp $ +$NetBSD: patch-bin_build-index.sh,v 1.2 2022/01/10 22:46:03 wiz Exp $ Fix default paths. + --- bin/build-index.sh.orig 2013-08-21 17:11:04.000000000 +0000 +++ bin/build-index.sh @@ -2,12 +2,12 @@ --_----------=_1641854763224800--