Mon Jan 10 22:46:03 2022 UTC ()
py-graphite-web: convert to egg.mk


(wiz)
diff -r1.9 -r1.10 pkgsrc/www/py-graphite-web/Makefile
diff -r1.1 -r1.2 pkgsrc/www/py-graphite-web/PLIST
diff -r1.3 -r1.4 pkgsrc/www/py-graphite-web/distinfo
diff -r1.1 -r1.2 pkgsrc/www/py-graphite-web/patches/patch-bin_build-index.sh
cvs diff -r1.9 -r1.10 pkgsrc/www/py-graphite-web/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-graphite-web/Attic/Makefile 2020/09/03 15:46:06 1.9
+++ pkgsrc/www/py-graphite-web/Attic/Makefile 2022/01/10 22:46:03 1.10
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2020/09/03 15:46:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2022/01/10 22:46:03 wiz Exp $
2 2
3DISTNAME= graphite-web-0.9.15 3DISTNAME= graphite-web-0.9.15
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= www 6CATEGORIES= www
6GITHUB_PROJECT= graphite-web 7GITHUB_PROJECT= graphite-web
7MASTER_SITES= ${MASTER_SITE_GITHUB:=graphite-project/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=graphite-project/}
8 9
9MAINTAINER= riz@NetBSD.org 10MAINTAINER= riz@NetBSD.org
10HOMEPAGE= https://launchpad.net/graphite 11HOMEPAGE= https://launchpad.net/graphite
11COMMENT= Enterprise scalable realtime graphing platform 12COMMENT= Enterprise scalable realtime graphing platform
12LICENSE= apache-2.0 13LICENSE= apache-2.0
13 14
14DEPENDS+= ${PYPKGPREFIX}-carbon>=${PKGREVISION_NOREV}:../../databases/py-carbon 15DEPENDS+= ${PYPKGPREFIX}-carbon>=${PKGREVISION_NOREV}:../../databases/py-carbon
15DEPENDS+= ${PYPKGPREFIX}-django>=1.3.1:../../www/py-django 16DEPENDS+= ${PYPKGPREFIX}-django>=1.3.1:../../www/py-django
16DEPENDS+= ${PYPKGPREFIX}-django-tagging>=0.3.1:../../www/py-django-tagging 17DEPENDS+= ${PYPKGPREFIX}-django-tagging>=0.3.1:../../www/py-django-tagging
17DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 18DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
@@ -50,29 +51,29 @@ MESSAGE_SUBST+= GRAPHITE_LOG_DIR=${GRAP @@ -50,29 +51,29 @@ MESSAGE_SUBST+= GRAPHITE_LOG_DIR=${GRAP
50MESSAGE_SUBST+= GRAPHITE_USER=${GRAPHITE_USER} 51MESSAGE_SUBST+= GRAPHITE_USER=${GRAPHITE_USER}
51MESSAGE_SUBST+= WWW_USER=${WWW_USER} 52MESSAGE_SUBST+= WWW_USER=${WWW_USER}
52 53
53PKG_SYSCONFSUBDIR= graphite 54PKG_SYSCONFSUBDIR= graphite
54 55
55GRAPHITE_CONF_FILES= dashboard.conf graphite.wsgi graphTemplates.conf 56GRAPHITE_CONF_FILES= dashboard.conf graphite.wsgi graphTemplates.conf
56 57
57.for file in ${GRAPHITE_CONF_FILES} 58.for file in ${GRAPHITE_CONF_FILES}
58CONF_FILES+= ${GRAPHITE_EGDIR}/${file}.example \ 59CONF_FILES+= ${GRAPHITE_EGDIR}/${file}.example \
59 ${PKG_SYSCONFDIR}/${file} 60 ${PKG_SYSCONFDIR}/${file}
60.endfor 61.endfor
61 62
62PYSETUPINSTALLARGS= --prefix=${PREFIX} \ 63PYSETUPINSTALLARGS= --prefix=${PREFIX} \
63 --install-lib=${PREFIX}/${PYSITELIB} 64 --install-lib=${PREFIX}/${PYSITELIB}
64PYTHON_VERSIONS_ACCEPTED= 27 # py-django-tagging 65PYTHON_VERSIONS_ACCEPTED= 27 # py-django-tagging
65 66
66INSTALLATION_DIRS+= share/examples/graphite 67INSTALLATION_DIRS+= share/examples/graphite
67 68
68pre-build: 69pre-build:
69 ${MKDIR} ${WRKSRC}/graphite/webapp 70 ${MKDIR} ${WRKSRC}/graphite/webapp
70 ${CP} -LR ${WRKSRC}/webapp/content ${WRKSRC}/graphite/webapp 71 ${CP} -LR ${WRKSRC}/webapp/content ${WRKSRC}/graphite/webapp
71 ${RM} -f ${WRKSRC}/bin/build-index.sh.orig 72 ${RM} -f ${WRKSRC}/bin/build-index.sh.orig
72 73
73post-install: 74post-install:
74 ${LN} -s ${PKG_SYSCONFDIR}/local_settings.py ${DESTDIR}${PREFIX}/${PYSITELIB}/graphite/ 75 ${LN} -s ${PKG_SYSCONFDIR}/local_settings.py ${DESTDIR}${PREFIX}/${PYSITELIB}/graphite/
75 76
76.include "../../databases/py-carbon/Makefile.common" 77.include "../../databases/py-carbon/Makefile.common"
77.include "../../lang/python/distutils.mk" 78.include "../../lang/python/egg.mk"
78.include "../../mk/bsd.pkg.mk" 79.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/www/py-graphite-web/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/py-graphite-web/Attic/PLIST 2015/12/11 21:45:07 1.1
+++ pkgsrc/www/py-graphite-web/Attic/PLIST 2022/01/10 22:46:03 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2015/12/11 21:45:07 riz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2022/01/10 22:46:03 wiz Exp $
2bin/build-index.sh 2bin/build-index.sh
3bin/run-graphite-devel-server.py 3bin/run-graphite-devel-server.py
4graphite/webapp/content/css/cli.css 4graphite/webapp/content/css/cli.css
5graphite/webapp/content/css/darkX.css 5graphite/webapp/content/css/darkX.css
6graphite/webapp/content/css/darkX/button-close-focused.png 6graphite/webapp/content/css/darkX/button-close-focused.png
7graphite/webapp/content/css/darkX/button-maximize-focused.png 7graphite/webapp/content/css/darkX/button-maximize-focused.png
8graphite/webapp/content/css/darkX/button-minimize-focused.png 8graphite/webapp/content/css/darkX/button-minimize-focused.png
9graphite/webapp/content/css/darkX/frame-bottom-left-focused.png 9graphite/webapp/content/css/darkX/frame-bottom-left-focused.png
10graphite/webapp/content/css/darkX/frame-bottom-mid-focused.png 10graphite/webapp/content/css/darkX/frame-bottom-mid-focused.png
11graphite/webapp/content/css/darkX/frame-bottom-right-focused.png 11graphite/webapp/content/css/darkX/frame-bottom-right-focused.png
12graphite/webapp/content/css/darkX/frame-left-focused.png 12graphite/webapp/content/css/darkX/frame-left-focused.png
13graphite/webapp/content/css/darkX/frame-right-focused.png 13graphite/webapp/content/css/darkX/frame-right-focused.png
14graphite/webapp/content/css/darkX/titlebar-left-focused.png 14graphite/webapp/content/css/darkX/titlebar-left-focused.png
@@ -746,19 +746,18 @@ ${PYSITELIB}/graphite/version/views.pyc @@ -746,19 +746,18 @@ ${PYSITELIB}/graphite/version/views.pyc
746${PYSITELIB}/graphite/version/views.pyo 746${PYSITELIB}/graphite/version/views.pyo
747${PYSITELIB}/graphite/views.py 747${PYSITELIB}/graphite/views.py
748${PYSITELIB}/graphite/views.pyc 748${PYSITELIB}/graphite/views.pyc
749${PYSITELIB}/graphite/views.pyo 749${PYSITELIB}/graphite/views.pyo
750${PYSITELIB}/graphite/whitelist/__init__.py 750${PYSITELIB}/graphite/whitelist/__init__.py
751${PYSITELIB}/graphite/whitelist/__init__.pyc 751${PYSITELIB}/graphite/whitelist/__init__.pyc
752${PYSITELIB}/graphite/whitelist/__init__.pyo 752${PYSITELIB}/graphite/whitelist/__init__.pyo
753${PYSITELIB}/graphite/whitelist/urls.py 753${PYSITELIB}/graphite/whitelist/urls.py
754${PYSITELIB}/graphite/whitelist/urls.pyc 754${PYSITELIB}/graphite/whitelist/urls.pyc
755${PYSITELIB}/graphite/whitelist/urls.pyo 755${PYSITELIB}/graphite/whitelist/urls.pyo
756${PYSITELIB}/graphite/whitelist/views.py 756${PYSITELIB}/graphite/whitelist/views.py
757${PYSITELIB}/graphite/whitelist/views.pyc 757${PYSITELIB}/graphite/whitelist/views.pyc
758${PYSITELIB}/graphite/whitelist/views.pyo 758${PYSITELIB}/graphite/whitelist/views.pyo
759${PYSITELIB}/${EGG_FILE} 
760share/examples/graphite/dashboard.conf.example 759share/examples/graphite/dashboard.conf.example
761share/examples/graphite/example-client.py 760share/examples/graphite/example-client.py
762share/examples/graphite/example-graphite-vhost.conf 761share/examples/graphite/example-graphite-vhost.conf
763share/examples/graphite/graphTemplates.conf.example 762share/examples/graphite/graphTemplates.conf.example
764share/examples/graphite/graphite.wsgi.example 763share/examples/graphite/graphite.wsgi.example
cvs diff -r1.3 -r1.4 pkgsrc/www/py-graphite-web/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/py-graphite-web/Attic/distinfo 2021/10/26 11:30:41 1.3
+++ pkgsrc/www/py-graphite-web/Attic/distinfo 2022/01/10 22:46:03 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2021/10/26 11:30:41 nia Exp $ 1$NetBSD: distinfo,v 1.4 2022/01/10 22:46:03 wiz Exp $
2 2
3BLAKE2s (graphite-web-0.9.15.tar.gz) = 736a8e1b5bcd2cc4f2fea245fe53a7e9f9b4c3a6939b76e4ac47dfc073d6fe44 3BLAKE2s (graphite-web-0.9.15.tar.gz) = 736a8e1b5bcd2cc4f2fea245fe53a7e9f9b4c3a6939b76e4ac47dfc073d6fe44
4SHA512 (graphite-web-0.9.15.tar.gz) = 055c0cf3e98db56ecd37c8926f83f82b38f88edbe795d183967dfe5e09391a8a838265afef6e426686a8dfbddd8e2164e445ca007b3454ec674142bbf8f693e2 4SHA512 (graphite-web-0.9.15.tar.gz) = 055c0cf3e98db56ecd37c8926f83f82b38f88edbe795d183967dfe5e09391a8a838265afef6e426686a8dfbddd8e2164e445ca007b3454ec674142bbf8f693e2
5Size (graphite-web-0.9.15.tar.gz) = 2434438 bytes 5Size (graphite-web-0.9.15.tar.gz) = 2434438 bytes
6SHA1 (patch-bin_build-index.sh) = 13ad11086c620bd65a7cf084a88ae0187fdae2d7 6SHA1 (patch-bin_build-index.sh) = 0373f48f64e254af25ab4b15747c18efafb3136c
7SHA1 (patch-setup.py) = 1f215025652d5d45302af8d13ee7ff7a91003cfc 7SHA1 (patch-setup.py) = 1f215025652d5d45302af8d13ee7ff7a91003cfc
cvs diff -r1.1 -r1.2 pkgsrc/www/py-graphite-web/patches/Attic/patch-bin_build-index.sh (expand / switch to unified diff)

--- pkgsrc/www/py-graphite-web/patches/Attic/patch-bin_build-index.sh 2015/12/11 21:45:07 1.1
+++ pkgsrc/www/py-graphite-web/patches/Attic/patch-bin_build-index.sh 2022/01/10 22:46:03 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-bin_build-index.sh,v 1.1 2015/12/11 21:45:07 riz Exp $ 1$NetBSD: patch-bin_build-index.sh,v 1.2 2022/01/10 22:46:03 wiz Exp $
2 2
3Fix default paths. 3Fix default paths.
 4
4--- bin/build-index.sh.orig 2013-08-21 17:11:04.000000000 +0000 5--- bin/build-index.sh.orig 2013-08-21 17:11:04.000000000 +0000
5+++ bin/build-index.sh 6+++ bin/build-index.sh
6@@ -2,12 +2,12 @@ 7@@ -2,12 +2,12 @@
7  8
8 if [ "$GRAPHITE_ROOT" = "" ] 9 if [ "$GRAPHITE_ROOT" = "" ]
9 then 10 then
10- GRAPHITE_ROOT="/opt/graphite" 11- GRAPHITE_ROOT="/opt/graphite"
11+ GRAPHITE_ROOT="@PREFIX@/graphite" 12+ GRAPHITE_ROOT="@PREFIX@/graphite"
12 fi 13 fi
13  14
14 if [ "$GRAPHITE_STORAGE_DIR" = "" ] 15 if [ "$GRAPHITE_STORAGE_DIR" = "" ]
15 then 16 then
16- GRAPHITE_STORAGE_DIR="${GRAPHITE_ROOT}/storage" 17- GRAPHITE_STORAGE_DIR="${GRAPHITE_ROOT}/storage"