From owner-svn-ports-all@FreeBSD.ORG Wed Oct 8 15:38:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D0737DE0; Wed, 8 Oct 2014 15:38:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A26A0FA8; Wed, 8 Oct 2014 15:38:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s98Fcs9S052719; Wed, 8 Oct 2014 15:38:54 GMT (envelope-from wg@FreeBSD.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s98FcsO2052717; Wed, 8 Oct 2014 15:38:54 GMT (envelope-from wg@FreeBSD.org) Message-Id: <201410081538.s98FcsO2052717@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wg set sender to wg@FreeBSD.org using -f From: William Grzybowski Date: Wed, 8 Oct 2014 15:38:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370447 - in head/games/pysolfc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Oct 2014 15:38:54 -0000 Author: wg Date: Wed Oct 8 15:38:53 2014 New Revision: 370447 URL: https://svnweb.freebsd.org/changeset/ports/370447 QAT: https://qat.redports.org/buildarchive/r370447/ Log: games/pysolfc: switch from py-imaging to py-pillow - USES python With hat: python Approved by: portmgr (bdrewery, implicit) Added: head/games/pysolfc/files/patch-pysollib__mfxutil.py (contents, props changed) Modified: head/games/pysolfc/Makefile Modified: head/games/pysolfc/Makefile ============================================================================== --- head/games/pysolfc/Makefile Wed Oct 8 15:24:20 2014 (r370446) +++ head/games/pysolfc/Makefile Wed Oct 8 15:38:53 2014 (r370447) @@ -2,7 +2,7 @@ PORTNAME= pysolfc PORTVERSION= 2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}/PySolFC/PySolFC-${PORTVERSION} \ SF/${PORTNAME}/PySolFC-Cardsets/PySolFC-Cardsets-${PORTVERSION}:cardsets @@ -15,7 +15,7 @@ COMMENT= Solitaire game, written in Pyth LICENSE= GPLv3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \ - ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging + ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow USES= python tar:bzip2 USE_PYTHON= autoplist distutils Added: head/games/pysolfc/files/patch-pysollib__mfxutil.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pysolfc/files/patch-pysollib__mfxutil.py Wed Oct 8 15:38:53 2014 (r370447) @@ -0,0 +1,29 @@ +--- pysollib/mfxutil.py.orig 2014-10-08 15:37:56 UTC ++++ pysollib/mfxutil.py +@@ -41,18 +41,18 @@ + Image = ImageTk = ImageOps = None + if TOOLKIT == 'tk': + try: # PIL +- import Image +- import ImageTk +- import ImageOps ++ from PIL import Image ++ from PIL import ImageTk ++ from PIL import ImageOps + except ImportError: + Image = None + else: + # for py2exe +- import GifImagePlugin +- import PngImagePlugin +- import JpegImagePlugin +- import BmpImagePlugin +- import PpmImagePlugin ++ from PIL import GifImagePlugin ++ from PIL import PngImagePlugin ++ from PIL import JpegImagePlugin ++ from PIL import BmpImagePlugin ++ from PIL import PpmImagePlugin + Image._initialized = 2 + +