svn commit: r357753 - in head/graphics/tilecache: . files

Marcus von Appen mva at FreeBSD.org
Sat Jun 14 08:04:52 UTC 2014 

Author: mva
Date: Sat Jun 14 08:04:51 2014
New Revision: 357753
URL: http://svnweb.freebsd.org/changeset/ports/357753
QAT: https://qat.redports.org/buildarchive/r357753/

Log:
  - Enable stagedir support
  - Remove easy_install dependency
  - Convert to PYDISTUTILS_AUTOPLIST
  - Bump PORTREVISION to enforce a cleanup for the easy_install references
  
  With hat:	python@
  Approved by:	portmgr (implicit)

Modified:
  head/graphics/tilecache/Makefile
  head/graphics/tilecache/files/patch-setup.py
  head/graphics/tilecache/pkg-plist

Modified: head/graphics/tilecache/Makefile
==============================================================================
--- head/graphics/tilecache/Makefile	Sat Jun 14 07:22:53 2014	(r357752)
+++ head/graphics/tilecache/Makefile	Sat Jun 14 08:04:51 2014	(r357753)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tilecache
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	graphics python geography www
 MASTER_SITES=	http://tilecache.org/
 
@@ -14,26 +15,25 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup
 
 LICENSE=	BSD
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TileCache
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 FILES_ETC=	TileCache/Service.py setup.py tilecache_install_config.py
 
-NO_STAGE=	yes
 post-patch:
 	@cd ${WRKSRC}; \
 	${REINPLACE_CMD} -e 's|/etc|${ETCDIR}|' ${FILES_ETC};
 
 pre-install:
-	${MKDIR} ${ETCDIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
-	${MKDIR} ${LOCALBASE}/www/cgi-bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin
 	${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|' ${WRKSRC}/tilecache.cgi
-	${INSTALL_SCRIPT} ${WRKSRC}/tilecache.cgi ${LOCALBASE}/www/cgi-bin/tilecache.cgi
+	${INSTALL_SCRIPT} ${WRKSRC}/tilecache.cgi ${STAGEDIR}${PREFIX}/www/cgi-bin/tilecache.cgi
 	${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|' ${WRKSRC}/tilecache.fcgi
-	${INSTALL_SCRIPT} ${WRKSRC}/tilecache.fcgi ${LOCALBASE}/www/cgi-bin/tilecache.fcgi
-	${INSTALL_DATA} ${WRKSRC}/tilecache.cfg ${ETCDIR}/tilecache.cfg.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/tilecache.fcgi ${STAGEDIR}${PREFIX}/www/cgi-bin/tilecache.fcgi
+	${INSTALL_DATA} ${WRKSRC}/tilecache.cfg ${STAGEDIR}${ETCDIR}/tilecache.cfg.sample
 
 .include <bsd.port.mk>

Modified: head/graphics/tilecache/files/patch-setup.py
==============================================================================
--- head/graphics/tilecache/files/patch-setup.py	Sat Jun 14 07:22:53 2014	(r357752)
+++ head/graphics/tilecache/files/patch-setup.py	Sat Jun 14 08:04:51 2014	(r357753)
@@ -1,6 +1,25 @@
---- setup.py.orig	2011-10-18 15:02:11.000000000 +0200
-+++ setup.py	2011-10-18 15:02:47.000000000 +0200
-@@ -39,8 +35,7 @@
+--- setup.py.orig	2010-10-15 12:57:57.000000000 +0200
++++ setup.py	2014-06-14 09:25:14.000000000 +0200
+@@ -21,15 +21,15 @@
+         'Topic :: Scientific/Engineering :: GIS',
+ ]
+ 
+-# We'd like to let debian install the /etc/tilecache.cfg,
++# We'd like to let debian install the /usr/local/etc/tilecache/tilecache.cfg,
+ # but put them in tilecache/tilecache.cfg using setuptools
+ # otherwise. 
+ extra = { }
+ if "--debian" in sys.argv:
+-   extra['data_files']=[('/etc', ['tilecache.cfg']),('.',['dev.ini'])]
++   extra['data_files']=[('/usr/local/etc/tilecache', ['tilecache.cfg'])]
+    sys.argv.remove("--debian")
+ else:
+-   extra['data_files']=[('TileCache', ['tilecache.cfg']),('.',['dev.ini'])]
++   extra['data_files']=[('TileCache', ['tilecache.cfg'])]
+     
+ setup(name='TileCache',
+       version='2.11',
+@@ -39,8 +39,7 @@
        url='http://tilecache.org/',
        long_description=readme,
        packages=['TileCache', 'TileCache.Caches', 'TileCache.Services', 'TileCache.Layers'],

Modified: head/graphics/tilecache/pkg-plist
==============================================================================
--- head/graphics/tilecache/pkg-plist	Sat Jun 14 07:22:53 2014	(r357752)
+++ head/graphics/tilecache/pkg-plist	Sat Jun 14 08:04:51 2014	(r357753)
@@ -1,122 +1,5 @@
-bin/tilecache_clean.py
-bin/tilecache_http_server.py
-bin/tilecache_install_config.py
-bin/tilecache_seed.py
 %%ETCDIR%%/tilecache.cfg.sample
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/tilecache_clean.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/tilecache_http_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/tilecache_install_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/tilecache_seed.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/AWSS3.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/AWSS3.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/AWSS3.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Disk.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Disk.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Disk.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/GoogleDisk.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/GoogleDisk.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/GoogleDisk.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/MBTiles.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/MBTiles.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/MBTiles.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Memcached.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Memcached.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Memcached.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/S3.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/S3.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/S3.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Test.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Test.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/Test.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/ArcXML.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/ArcXML.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/ArcXML.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/GDAL.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/GDAL.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/GDAL.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/Image.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/Image.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/Image.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/MapServer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/MapServer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/MapServer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/Mapnik.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/Mapnik.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/Mapnik.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/WMS.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/WMS.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/WMS.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Service.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Service.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Service.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/JSON.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/JSON.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/JSON.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/KML.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/KML.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/KML.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/MGMaps.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/MGMaps.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/MGMaps.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/TMS.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/TMS.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/TMS.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/TileService.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/TileService.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/TileService.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/VETMS.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/VETMS.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/VETMS.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WMS.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WMS.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WMS.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WMTS.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WMTS.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WMTS.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WorldWind.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WorldWind.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/WorldWind.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Swarm.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Swarm.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Swarm.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/tilecache.cfg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/dev.ini
 www/cgi-bin/tilecache.cgi
 www/cgi-bin/tilecache.fcgi
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Services
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Layers
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache/Caches
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/TileCache
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
- at dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%ETCDIR%%
 @dirrmtry www/cgi-bin

More information about the svn-ports-head mailing list