Date: Tue, 7 Oct 2014 12:01:52 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370307 - in head/www/twms: . files Message-ID: <201410071201.s97C1q01045300@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Tue Oct 7 12:01:51 2014 New Revision: 370307 URL: https://svnweb.freebsd.org/changeset/ports/370307 QAT: https://qat.redports.org/buildarchive/r370307/ Log: www/twms: switch from py-imaging to py-pillow With hat: python Approved by: portmgr (bdrewery, implicit) Added: head/www/twms/files/patch-twms__canvas.py (contents, props changed) head/www/twms/files/patch-twms__drawing.py (contents, props changed) head/www/twms/files/patch-twms__fetchers.py (contents, props changed) head/www/twms/files/patch-twms__filter.py (contents, props changed) head/www/twms/files/patch-twms__reproject.py (contents, props changed) Modified: head/www/twms/Makefile Modified: head/www/twms/Makefile ============================================================================== --- head/www/twms/Makefile Tue Oct 7 12:01:21 2014 (r370306) +++ head/www/twms/Makefile Tue Oct 7 12:01:51 2014 (r370307) @@ -3,7 +3,7 @@ PORTNAME= twms PORTVERSION= 0.02w -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www astro MASTER_SITES= GOOGLE_CODE @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyproj/__init__.py:${PORTSDIR}/graphics/py-pyproj \ ${PYTHON_SITELIBDIR}/web/__init__.py:${PORTSDIR}/www/webpy \ - ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging + ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow USES= python tar:bzip2 NO_BUILD= yes Added: head/www/twms/files/patch-twms__canvas.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/twms/files/patch-twms__canvas.py Tue Oct 7 12:01:51 2014 (r370307) @@ -0,0 +1,18 @@ +--- twms/canvas.py.orig 2014-10-07 11:58:01 UTC ++++ twms/canvas.py +@@ -24,7 +24,7 @@ + + + import projections +-import Image, ImageFilter ++from PIL import Image, ImageFilter + import urllib2 + import StringIO + import datetime +@@ -132,4 +132,4 @@ + tiles = self.tiles.keys() + for tile in tiles: + self.tiles[tile]["im"] = self.tiles[tile]["im"].filter(ImageFilter.MedianFilter(size)) +- self.tiles[tile]["pix"] = self.tiles[tile]["im"].load() +\ No newline at end of file ++ self.tiles[tile]["pix"] = self.tiles[tile]["im"].load() Added: head/www/twms/files/patch-twms__drawing.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/twms/files/patch-twms__drawing.py Tue Oct 7 12:01:51 2014 (r370307) @@ -0,0 +1,18 @@ +--- twms/drawing.py.orig 2014-10-07 11:57:57 UTC ++++ twms/drawing.py +@@ -13,7 +13,7 @@ + + # You should have received a copy of the GNU General Public License + # along with tWMS. If not, see <http://www.gnu.org/licenses/>. +-import Image, ImageDraw ++from PIL import Image, ImageDraw + import urllib + import os, sys + +@@ -79,4 +79,4 @@ + draw.ellipse((coords[0][0]-3,coords[0][1]-3,coords[0][0]+3,coords[0][1]+3),fill=color,outline=color) + elif geometry == "POLYGON": + draw.polygon(coords, fill=color, outline=color) +- return img +\ No newline at end of file ++ return img Added: head/www/twms/files/patch-twms__fetchers.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/twms/files/patch-twms__fetchers.py Tue Oct 7 12:01:51 2014 (r370307) @@ -0,0 +1,18 @@ +--- twms/fetchers.py.orig 2014-10-07 11:58:04 UTC ++++ twms/fetchers.py +@@ -21,7 +21,7 @@ + import math + import sys + import StringIO +-import Image ++from PIL import Image + + import config + import projections +@@ -115,4 +115,4 @@ + tne.close() + os.remove(local+ this_layer["ext"]) + return False +- return im +\ No newline at end of file ++ return im Added: head/www/twms/files/patch-twms__filter.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/twms/files/patch-twms__filter.py Tue Oct 7 12:01:51 2014 (r370307) @@ -0,0 +1,13 @@ +--- twms/filter.py.orig 2014-10-07 11:57:53 UTC ++++ twms/filter.py +@@ -15,8 +15,8 @@ + # along with tWMS. If not, see <http://www.gnu.org/licenses/>. + + +-import ImageFilter +-import ImageEnhance ++from PIL import ImageFilter ++from PIL import ImageEnhance + + def raster(result_img, filt): + """ Added: head/www/twms/files/patch-twms__reproject.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/twms/files/patch-twms__reproject.py Tue Oct 7 12:01:51 2014 (r370307) @@ -0,0 +1,11 @@ +--- twms/reproject.py.orig 2014-10-07 11:58:11 UTC ++++ twms/reproject.py +@@ -14,7 +14,7 @@ + # You should have received a copy of the GNU General Public License + # along with tWMS. If not, see <http://www.gnu.org/licenses/>. + +-import Image ++from PIL import Image + import projections + import sys +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410071201.s97C1q01045300>