From a4a277abfa18938280809776f44aac5dce863637 Mon Sep 17 00:00:00 2001 From: kleink <kleink@pkgsrc.org> Date: Wed, 21 Jan 2015 13:22:20 +0000 Subject: Append PKGVERSION_NOREV to EGG_NAME so that EGG_INFODIR substitution can happen; noticed during bulk building with a different PYVERSION than the one that had crept into the PLIST. Bump PKGREVISION. --- geography/py-google-maps-services-python/Makefile | 5 +++-- geography/py-google-maps-services-python/PLIST | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/geography/py-google-maps-services-python/Makefile b/geography/py-google-maps-services-python/Makefile index b330f485d80..4996b16ed4b 100644 --- a/geography/py-google-maps-services-python/Makefile +++ b/geography/py-google-maps-services-python/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2015/01/12 10:27:41 kleink Exp $ +# $NetBSD: Makefile,v 1.2 2015/01/21 13:22:20 kleink Exp $ DISTNAME= google-maps-services-python-2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= geography python MASTER_SITES= -https://github.com/googlemaps/google-maps-services-python/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX} @@ -12,7 +13,7 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests -EGG_NAME= googlemaps +EGG_NAME= googlemaps-${PKGVERSION_NOREV} PYTHON_VERSIONS_INCOMPATIBLE= 33 .include "../../lang/python/egg.mk" diff --git a/geography/py-google-maps-services-python/PLIST b/geography/py-google-maps-services-python/PLIST index 5ece520c5a8..0410b2b21a1 100644 --- a/geography/py-google-maps-services-python/PLIST +++ b/geography/py-google-maps-services-python/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2015/01/12 10:27:41 kleink Exp $ -${PYSITELIB}/googlemaps-${PKGVERSION}-py2.7.egg-info/PKG-INFO -${PYSITELIB}/googlemaps-${PKGVERSION}-py2.7.egg-info/SOURCES.txt -${PYSITELIB}/googlemaps-${PKGVERSION}-py2.7.egg-info/dependency_links.txt -${PYSITELIB}/googlemaps-${PKGVERSION}-py2.7.egg-info/requires.txt -${PYSITELIB}/googlemaps-${PKGVERSION}-py2.7.egg-info/top_level.txt +@comment $NetBSD: PLIST,v 1.2 2015/01/21 13:22:20 kleink Exp $ +${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 ${PYSITELIB}/googlemaps/__init__.py ${PYSITELIB}/googlemaps/__init__.pyc ${PYSITELIB}/googlemaps/__init__.pyo -- cgit v1.2.3