[pkgsrc/trunk]: pkgsrc/games/pysolfc Remove dependency on py-imagingtk. pyso...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/22d46b647341
branches:  trunk
changeset: 399001:22d46b647341
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat Sep 12 19:45:29 2009 +0000

description:
Remove dependency on py-imagingtk.  pysolfc works fine without it.  The
problem wiz stumbled upon only occurs if py-imaging is installed and
py-imagingtk is not.  pysolfc assumed that if py-imaging was installed,
py-imagingtk was also installed.  patch-ac corrects this by simply
disabling the runtime detection of these optional dependencies.

The real issue, it seems to me, is that py-imaging installs ImageTk.py,
which needs py-imagingtk to be useful.  This is why pysolfc got
confused.  pkgsrc should probably be changed to install ImageTk.py in
the py-imagingtk package instead, but I'd rather not audit all
py-imaging users right now, so I'll leave that for someone else.

Bump PKGREVISION to 4.

diffstat:

 games/pysolfc/Makefile         |   6 ++----
 games/pysolfc/distinfo         |   3 ++-
 games/pysolfc/patches/patch-ac |  26 ++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diffs (66 lines):

diff -r 1a1ee6b26996 -r 22d46b647341 games/pysolfc/Makefile
--- a/games/pysolfc/Makefile    Sat Sep 12 19:44:03 2009 +0000
+++ b/games/pysolfc/Makefile    Sat Sep 12 19:45:29 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/09/12 14:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/12 19:45:29 snj Exp $
 
 DISTNAME=      PySolFC-1.1
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    games python
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pysolfc/}
 EXTRACT_SUFX=  .tar.bz2
@@ -12,8 +12,6 @@
 COMMENT=       Over 1000 solitaire games
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PYPKGPREFIX}-imagingtk-[0-9]*:../../graphics/py-imagingtk
-
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 PYDISTUTILSPKG=        yes
diff -r 1a1ee6b26996 -r 22d46b647341 games/pysolfc/distinfo
--- a/games/pysolfc/distinfo    Sat Sep 12 19:44:03 2009 +0000
+++ b/games/pysolfc/distinfo    Sat Sep 12 19:45:29 2009 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/16 07:12:03 snj Exp $
+$NetBSD: distinfo,v 1.2 2009/09/12 19:45:29 snj Exp $
 
 SHA1 (PySolFC-1.1.tar.bz2) = 5ff4d8c7f238c5dab6122e916aeae2de2d945123
 RMD160 (PySolFC-1.1.tar.bz2) = 2aa02c07294270281d5a685eb6b19086c85a7171
 Size (PySolFC-1.1.tar.bz2) = 3667355 bytes
 SHA1 (patch-aa) = c51bc9223f6abeed7de83c5d2615ca8f88c798a7
 SHA1 (patch-ab) = c3572b6659a109fa68852f298d352d14f3f46498
+SHA1 (patch-ac) = bef091ec396318e184032538314590ee9003c673
diff -r 1a1ee6b26996 -r 22d46b647341 games/pysolfc/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/pysolfc/patches/patch-ac    Sat Sep 12 19:45:29 2009 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1 2009/09/12 19:45:29 snj Exp $
+
+--- pysollib/mfxutil.py.orig   2009-09-12 12:22:02.000000000 -0700
++++ pysollib/mfxutil.py        2009-09-12 12:22:14.000000000 -0700
+@@ -51,21 +51,6 @@ except:
+ from settings import PACKAGE, TOOLKIT
+ 
+ Image = ImageTk = ImageOps = None
+-if TOOLKIT == 'tk':
+-    try: # PIL
+-        import Image
+-    except ImportError:
+-        pass
+-    else:
+-        import ImageTk
+-        import ImageOps
+-        # for py2exe
+-        import GifImagePlugin
+-        import PngImagePlugin
+-        import JpegImagePlugin
+-        import BmpImagePlugin
+-        import PpmImagePlugin
+-        Image._initialized = 2
+ 
+ 
+ # /***********************************************************************