update of pysolfc to version 2.0

upstream change announcement:
    December 04, 2009: PySolFC v.2.0 (1061 games) and PySolFC-Cardsets v.2.0 (153 cardsets)
        the license was changed to the GPLv3 or newer
        13 new games
        migration to new python-ttk module
        improved look of the deck (required python-imaging v.1.1.7)
        fixed Hanafuda games (ticket)
        new config-file option: sound_sample_buffer_size (ticket)
        portable version for windows (ticket)
        many other bugfixes

6 files changed, 296 insertions, 98 deletions

diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index f47ab936967..d0a2cd5e5fd 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2012/08/21 23:49:21 marino Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/01 19:44:33 spz Exp $
 
-DISTNAME=	PySolFC-1.1
+DISTNAME=	PySolFC-2.0
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	8
 CATEGORIES=	games python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pysolfc/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pysolfc.sourceforge.net/
 COMMENT=	Over 1000 solitaire games
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,7 +17,208 @@ PYDISTUTILSPKG=	yes
 
 REPLACE_PYTHON+= \
 	data/themes/clearlooks/create_imgs.py \
-	pysollib/games/siebenbisas.py
+	pysollib/__init__.py \
+	pysollib/acard.py \
+	pysollib/actions.py \
+	pysollib/app.py \
+	pysollib/customgame.py \
+	pysollib/game.py \
+	pysollib/gamedb.py \
+	pysollib/games/__init__.py \
+	pysollib/games/acesup.py \
+	pysollib/games/algerian.py \
+	pysollib/games/auldlangsyne.py \
+	pysollib/games/bakersdozen.py \
+	pysollib/games/bakersgame.py \
+	pysollib/games/beleagueredcastle.py \
+	pysollib/games/bisley.py \
+	pysollib/games/braid.py \
+	pysollib/games/bristol.py \
+	pysollib/games/buffalobill.py \
+	pysollib/games/calculation.py \
+	pysollib/games/camelot.py \
+	pysollib/games/canfield.py \
+	pysollib/games/capricieuse.py \
+	pysollib/games/curdsandwhey.py \
+	pysollib/games/dieboesesieben.py \
+	pysollib/games/diplomat.py \
+	pysollib/games/doublets.py \
+	pysollib/games/eiffeltower.py \
+	pysollib/games/fan.py \
+	pysollib/games/fortythieves.py \
+	pysollib/games/freecell.py \
+	pysollib/games/glenwood.py \
+	pysollib/games/golf.py                             \
+	pysollib/games/grandduchess.py \
+	pysollib/games/grandfathersclock.py \
+	pysollib/games/gypsy.py \
+	pysollib/games/harp.py \
+	pysollib/games/headsandtails.py \
+	pysollib/games/katzenschwanz.py \
+	pysollib/games/klondike.py \
+	pysollib/games/labyrinth.py \
+	pysollib/games/larasgame.py \
+	pysollib/games/mahjongg/__init__.py \
+	pysollib/games/mahjongg/mahjongg.py \
+	pysollib/games/mahjongg/mahjongg1.py \
+	pysollib/games/mahjongg/mahjongg2.py \
+	pysollib/games/mahjongg/mahjongg3.py \
+	pysollib/games/mahjongg/shisensho.py \
+	pysollib/games/matriarchy.py \
+	pysollib/games/montana.py \
+	pysollib/games/montecarlo.py \
+	pysollib/games/napoleon.py \
+	pysollib/games/needle.py \
+	pysollib/games/numerica.py \
+	pysollib/games/osmosis.py \
+	pysollib/games/parallels.py \
+	pysollib/games/pasdedeux.py \
+	pysollib/games/picturegallery.py \
+	pysollib/games/pileon.py \
+	pysollib/games/pushpin.py \
+	pysollib/games/pyramid.py \
+	pysollib/games/royalcotillion.py \
+	pysollib/games/royaleast.py \
+	pysollib/games/sanibel.py \
+	pysollib/games/siebenbisas.py \
+	pysollib/games/simplex.py \
+	pysollib/games/special/__init__.py \
+	pysollib/games/special/hanoi.py \
+	pysollib/games/special/memory.py \
+	pysollib/games/special/pegged.py \
+	pysollib/games/special/poker.py \
+	pysollib/games/special/tarock.py \
+	pysollib/games/spider.py \
+	pysollib/games/sthelena.py \
+	pysollib/games/sultan.py \
+	pysollib/games/takeaway.py \
+	pysollib/games/terrace.py \
+	pysollib/games/threepeaks.py \
+	pysollib/games/tournament.py \
+	pysollib/games/ultra/__init__.py \
+	pysollib/games/ultra/dashavatara.py \
+	pysollib/games/ultra/hanafuda.py \
+	pysollib/games/ultra/hanafuda1.py \
+	pysollib/games/ultra/hanafuda_common.py \
+	pysollib/games/ultra/hexadeck.py \
+	pysollib/games/ultra/larasgame.py \
+	pysollib/games/ultra/matrix.py \
+	pysollib/games/ultra/mughal.py \
+	pysollib/games/ultra/tarock.py \
+	pysollib/games/unionsquare.py \
+	pysollib/games/wavemotion.py \
+	pysollib/games/windmill.py \
+	pysollib/games/yukon.py \
+	pysollib/games/zodiac.py \
+	pysollib/help.py \
+	pysollib/hint.py \
+	pysollib/images.py \
+	pysollib/init.py \
+	pysollib/layout.py \
+	pysollib/macosx/__init__.py \
+	pysollib/macosx/appSupport.py \
+	pysollib/main.py \
+	pysollib/mfxutil.py \
+	pysollib/move.py \
+	pysollib/options.py \
+	pysollib/pysolaudio.py \
+	pysollib/pysolgtk/__init__.py \
+	pysollib/pysolgtk/card.py \
+	pysollib/pysolgtk/colorsdialog.py \
+	pysollib/pysolgtk/edittextdialog.py \
+	pysollib/pysolgtk/findcarddialog.py \
+	pysollib/pysolgtk/fontsdialog.py \
+	pysollib/pysolgtk/gameinfodialog.py \
+	pysollib/pysolgtk/menubar.py \
+	pysollib/pysolgtk/playeroptionsdialog.py \
+	pysollib/pysolgtk/progressbar.py \
+	pysollib/pysolgtk/pysoltree.py \
+	pysollib/pysolgtk/selectcardset.py \
+	pysollib/pysolgtk/selectgame.py \
+	pysollib/pysolgtk/selecttile.py \
+	pysollib/pysolgtk/solverdialog.py \
+	pysollib/pysolgtk/soundoptionsdialog.py \
+	pysollib/pysolgtk/statusbar.py \
+	pysollib/pysolgtk/timeoutsdialog.py \
+	pysollib/pysolgtk/tkcanvas.py \
+	pysollib/pysolgtk/tkconst.py \
+	pysollib/pysolgtk/tkhtml.py \
+	pysollib/pysolgtk/tkstats.py \
+	pysollib/pysolgtk/tkutil.py \
+	pysollib/pysolgtk/tkwidget.py \
+	pysollib/pysolgtk/tkwrap.py \
+	pysollib/pysolgtk/toolbar.py \
+	pysollib/pysolrandom.py \
+	pysollib/pysoltk.py \
+	pysollib/resource.py \
+	pysollib/settings.py \
+	pysollib/stack.py \
+	pysollib/stats.py \
+	pysollib/tile/__init__.py \
+	pysollib/tile/card.py \
+	pysollib/tile/colorsdialog.py \
+	pysollib/tile/edittextdialog.py \
+	pysollib/tile/findcarddialog.py \
+	pysollib/tile/fontsdialog.py \
+	pysollib/tile/gameinfodialog.py \
+	pysollib/tile/menubar.py \
+	pysollib/tile/playeroptionsdialog.py \
+	pysollib/tile/progressbar.py \
+	pysollib/tile/selectcardset.py \
+	pysollib/tile/selectgame.py \
+	pysollib/tile/selecttile.py \
+	pysollib/tile/selecttree.py \
+	pysollib/tile/solverdialog.py \
+	pysollib/tile/soundoptionsdialog.py \
+	pysollib/tile/statusbar.py \
+	pysollib/tile/timeoutsdialog.py \
+	pysollib/tile/tkcanvas.py \
+	pysollib/tile/tkconst.py \
+	pysollib/tile/tkhtml.py \
+	pysollib/tile/tkstats.py \
+	pysollib/tile/tktree.py \
+	pysollib/tile/tkutil.py \
+	pysollib/tile/tkwidget.py \
+	pysollib/tile/tkwrap.py \
+	pysollib/tile/toolbar.py \
+	pysollib/tile/wizarddialog.py \
+	pysollib/tk/__init__.py \
+	pysollib/tk/card.py \
+	pysollib/tk/colorsdialog.py \
+	pysollib/tk/edittextdialog.py \
+	pysollib/tk/findcarddialog.py \
+	pysollib/tk/fontsdialog.py \
+	pysollib/tk/gameinfodialog.py \
+	pysollib/tk/menubar.py \
+	pysollib/tk/playeroptionsdialog.py \
+	pysollib/tk/progressbar.py \
+	pysollib/tk/selectcardset.py \
+	pysollib/tk/selectgame.py \
+	pysollib/tk/selecttile.py \
+	pysollib/tk/selecttree.py \
+	pysollib/tk/solverdialog.py \
+	pysollib/tk/soundoptionsdialog.py \
+	pysollib/tk/statusbar.py \
+	pysollib/tk/tabpage.py \
+	pysollib/tk/timeoutsdialog.py \
+	pysollib/tk/tkcanvas.py \
+	pysollib/tk/tkconst.py \
+	pysollib/tk/tkhtml.py \
+	pysollib/tk/tkstats.py \
+	pysollib/tk/tktree.py \
+	pysollib/tk/tkutil.py \
+	pysollib/tk/tkwidget.py \
+	pysollib/tk/tkwrap.py \
+	pysollib/tk/toolbar.py \
+	pysollib/tk/wizarddialog.py \
+	pysollib/util.py \
+	pysollib/winsystems/__init__.py \
+	pysollib/winsystems/aqua.py \
+	pysollib/winsystems/common.py \
+	pysollib/winsystems/win32.py \
+	pysollib/winsystems/x11.py \
+	pysollib/wizardpresets.py \
+	pysollib/wizardutil.py
 
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		post-patch
@@ -32,7 +232,8 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/pysol.6 \
 	  ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/pysol.py.6
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../x11/py-Tk/buildlink3.mk"
+.include "../../graphics/py-imagingtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pysolfc/PLIST b/games/pysolfc/PLIST
index 64e24dcfec1..de85d3aab22 100644
--- a/games/pysolfc/PLIST
+++ b/games/pysolfc/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2009/08/08 06:09:29 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/09/01 19:44:33 spz Exp $
 bin/pysol.py
-man/man6/pysol.py.6
 ${PYSITELIB}/pysollib/__init__.py
 ${PYSITELIB}/pysollib/__init__.pyc
 ${PYSITELIB}/pysollib/__init__.pyo
@@ -421,9 +420,6 @@ ${PYSITELIB}/pysollib/stack.pyo
 ${PYSITELIB}/pysollib/stats.py
 ${PYSITELIB}/pysollib/stats.pyc
 ${PYSITELIB}/pysollib/stats.pyo
-${PYSITELIB}/pysollib/tile/Tile.py
-${PYSITELIB}/pysollib/tile/Tile.pyc
-${PYSITELIB}/pysollib/tile/Tile.pyo
 ${PYSITELIB}/pysollib/tile/__init__.py
 ${PYSITELIB}/pysollib/tile/__init__.pyc
 ${PYSITELIB}/pysollib/tile/__init__.pyo
@@ -505,6 +501,9 @@ ${PYSITELIB}/pysollib/tile/tkwrap.pyo
 ${PYSITELIB}/pysollib/tile/toolbar.py
 ${PYSITELIB}/pysollib/tile/toolbar.pyc
 ${PYSITELIB}/pysollib/tile/toolbar.pyo
+${PYSITELIB}/pysollib/tile/ttk.py
+${PYSITELIB}/pysollib/tile/ttk.pyc
+${PYSITELIB}/pysollib/tile/ttk.pyo
 ${PYSITELIB}/pysollib/tile/wizarddialog.py
 ${PYSITELIB}/pysollib/tile/wizarddialog.pyc
 ${PYSITELIB}/pysollib/tile/wizarddialog.pyo
@@ -619,6 +618,7 @@ ${PYSITELIB}/pysollib/wizardpresets.pyo
 ${PYSITELIB}/pysollib/wizardutil.py
 ${PYSITELIB}/pysollib/wizardutil.pyc
 ${PYSITELIB}/pysollib/wizardutil.pyo
+man/man6/pysol.py.6
 share/PySolFC/cardset-2000/01c.gif
 share/PySolFC/cardset-2000/01d.gif
 share/PySolFC/cardset-2000/01h.gif
@@ -1239,58 +1239,54 @@ share/PySolFC/cardset-hexadeck/xshadow10.gif
 share/PySolFC/cardset-hexadeck/xshadow11.gif
 share/PySolFC/cardset-hexadeck/xshadow12.gif
 share/PySolFC/cardset-hexadeck/xshadow13.gif
+share/PySolFC/cardset-kintengu/01a.gif
+share/PySolFC/cardset-kintengu/01b.gif
 share/PySolFC/cardset-kintengu/01c.gif
 share/PySolFC/cardset-kintengu/01d.gif
+share/PySolFC/cardset-kintengu/01e.gif
+share/PySolFC/cardset-kintengu/01f.gif
+share/PySolFC/cardset-kintengu/01g.gif
 share/PySolFC/cardset-kintengu/01h.gif
-share/PySolFC/cardset-kintengu/01s.gif
+share/PySolFC/cardset-kintengu/01i.gif
+share/PySolFC/cardset-kintengu/01j.gif
+share/PySolFC/cardset-kintengu/01k.gif
+share/PySolFC/cardset-kintengu/01l.gif
+share/PySolFC/cardset-kintengu/02a.gif
+share/PySolFC/cardset-kintengu/02b.gif
 share/PySolFC/cardset-kintengu/02c.gif
 share/PySolFC/cardset-kintengu/02d.gif
+share/PySolFC/cardset-kintengu/02e.gif
+share/PySolFC/cardset-kintengu/02f.gif
+share/PySolFC/cardset-kintengu/02g.gif
 share/PySolFC/cardset-kintengu/02h.gif
-share/PySolFC/cardset-kintengu/02s.gif
+share/PySolFC/cardset-kintengu/02i.gif
+share/PySolFC/cardset-kintengu/02j.gif
+share/PySolFC/cardset-kintengu/02k.gif
+share/PySolFC/cardset-kintengu/02l.gif
+share/PySolFC/cardset-kintengu/03a.gif
+share/PySolFC/cardset-kintengu/03b.gif
 share/PySolFC/cardset-kintengu/03c.gif
 share/PySolFC/cardset-kintengu/03d.gif
+share/PySolFC/cardset-kintengu/03e.gif
+share/PySolFC/cardset-kintengu/03f.gif
+share/PySolFC/cardset-kintengu/03g.gif
 share/PySolFC/cardset-kintengu/03h.gif
-share/PySolFC/cardset-kintengu/03s.gif
+share/PySolFC/cardset-kintengu/03i.gif
+share/PySolFC/cardset-kintengu/03j.gif
+share/PySolFC/cardset-kintengu/03k.gif
+share/PySolFC/cardset-kintengu/03l.gif
+share/PySolFC/cardset-kintengu/04a.gif
+share/PySolFC/cardset-kintengu/04b.gif
 share/PySolFC/cardset-kintengu/04c.gif
 share/PySolFC/cardset-kintengu/04d.gif
+share/PySolFC/cardset-kintengu/04e.gif
+share/PySolFC/cardset-kintengu/04f.gif
+share/PySolFC/cardset-kintengu/04g.gif
 share/PySolFC/cardset-kintengu/04h.gif
-share/PySolFC/cardset-kintengu/04s.gif
-share/PySolFC/cardset-kintengu/05c.gif
-share/PySolFC/cardset-kintengu/05d.gif
-share/PySolFC/cardset-kintengu/05h.gif
-share/PySolFC/cardset-kintengu/05s.gif
-share/PySolFC/cardset-kintengu/06c.gif
-share/PySolFC/cardset-kintengu/06d.gif
-share/PySolFC/cardset-kintengu/06h.gif
-share/PySolFC/cardset-kintengu/06s.gif
-share/PySolFC/cardset-kintengu/07c.gif
-share/PySolFC/cardset-kintengu/07d.gif
-share/PySolFC/cardset-kintengu/07h.gif
-share/PySolFC/cardset-kintengu/07s.gif
-share/PySolFC/cardset-kintengu/08c.gif
-share/PySolFC/cardset-kintengu/08d.gif
-share/PySolFC/cardset-kintengu/08h.gif
-share/PySolFC/cardset-kintengu/08s.gif
-share/PySolFC/cardset-kintengu/09c.gif
-share/PySolFC/cardset-kintengu/09d.gif
-share/PySolFC/cardset-kintengu/09h.gif
-share/PySolFC/cardset-kintengu/09s.gif
-share/PySolFC/cardset-kintengu/10c.gif
-share/PySolFC/cardset-kintengu/10d.gif
-share/PySolFC/cardset-kintengu/10h.gif
-share/PySolFC/cardset-kintengu/10s.gif
-share/PySolFC/cardset-kintengu/11c.gif
-share/PySolFC/cardset-kintengu/11d.gif
-share/PySolFC/cardset-kintengu/11h.gif
-share/PySolFC/cardset-kintengu/11s.gif
-share/PySolFC/cardset-kintengu/12c.gif
-share/PySolFC/cardset-kintengu/12d.gif
-share/PySolFC/cardset-kintengu/12h.gif
-share/PySolFC/cardset-kintengu/12s.gif
-share/PySolFC/cardset-kintengu/13c.gif
-share/PySolFC/cardset-kintengu/13d.gif
-share/PySolFC/cardset-kintengu/13h.gif
-share/PySolFC/cardset-kintengu/13s.gif
+share/PySolFC/cardset-kintengu/04i.gif
+share/PySolFC/cardset-kintengu/04j.gif
+share/PySolFC/cardset-kintengu/04k.gif
+share/PySolFC/cardset-kintengu/04l.gif
 share/PySolFC/cardset-kintengu/COPYRIGHT
 share/PySolFC/cardset-kintengu/back01.gif
 share/PySolFC/cardset-kintengu/back02.gif
@@ -2243,7 +2239,6 @@ share/PySolFC/html/rules/generalspatience.html
 share/PySolFC/html/rules/germanpatience.html
 share/PySolFC/html/rules/ghulam.html
 share/PySolFC/html/rules/giant.html
-share/PySolFC/html/rules/glenwood.html
 share/PySolFC/html/rules/golf.html
 share/PySolFC/html/rules/goodmeasure.html
 share/PySolFC/html/rules/grandduchess.html
@@ -2253,6 +2248,7 @@ share/PySolFC/html/rules/grasshopper.html
 share/PySolFC/html/rules/greaterqueue.html
 share/PySolFC/html/rules/greatwall.html
 share/PySolFC/html/rules/griffon.html
+share/PySolFC/html/rules/groundsforadivorce.html
 share/PySolFC/html/rules/gypsy.html
 share/PySolFC/html/rules/hanafudafourseasons.html
 share/PySolFC/html/rules/hanafudafourwinds.html
@@ -2496,6 +2492,26 @@ share/PySolFC/html/rules_alternate.html
 share/PySolFC/images/buttons/bluecurve/cancel.gif
 share/PySolFC/images/buttons/bluecurve/new.gif
 share/PySolFC/images/buttons/bluecurve/ok.gif
+share/PySolFC/images/cards/bottoms/french/bottom02-n.png
+share/PySolFC/images/cards/bottoms/french/bottom02.png
+share/PySolFC/images/cards/bottoms/french/bottom03-n.png
+share/PySolFC/images/cards/bottoms/french/bottom03.png
+share/PySolFC/images/cards/bottoms/french/bottom04-n.png
+share/PySolFC/images/cards/bottoms/french/bottom04.png
+share/PySolFC/images/cards/bottoms/french/bottom05-n.png
+share/PySolFC/images/cards/bottoms/french/bottom05.png
+share/PySolFC/images/cards/bottoms/french/bottom06-n.png
+share/PySolFC/images/cards/bottoms/french/bottom06.png
+share/PySolFC/images/cards/bottoms/french/bottom07-n.png
+share/PySolFC/images/cards/bottoms/french/bottom07.png
+share/PySolFC/images/cards/bottoms/french/l01-n.png
+share/PySolFC/images/cards/bottoms/french/l01.png
+share/PySolFC/images/cards/bottoms/french/l02-n.png
+share/PySolFC/images/cards/bottoms/french/l02.png
+share/PySolFC/images/cards/bottoms/french/l03-n.png
+share/PySolFC/images/cards/bottoms/french/l03.png
+share/PySolFC/images/cards/bottoms/french/l04-n.png
+share/PySolFC/images/cards/bottoms/french/l04.png
 share/PySolFC/images/cards/large/01c.gif
 share/PySolFC/images/cards/large/01d.gif
 share/PySolFC/images/cards/large/01h.gif
@@ -2627,12 +2643,14 @@ share/PySolFC/images/pause/pause01.gif
 share/PySolFC/images/pause/pause02.gif
 share/PySolFC/images/pause/pause03.gif
 share/PySolFC/images/redeal.gif
+share/PySolFC/images/redeal.png
 share/PySolFC/images/selectgame.gif
 share/PySolFC/images/shadow.gif
 share/PySolFC/images/stats/barchart.gif
 share/PySolFC/images/stats/progression.jpg
 share/PySolFC/images/stoplight.gif
 share/PySolFC/images/stopsign.gif
+share/PySolFC/images/stopsign.png
 share/PySolFC/images/toolbar/bluecurve/large/autodrop.gif
 share/PySolFC/images/toolbar/bluecurve/large/new.gif
 share/PySolFC/images/toolbar/bluecurve/large/open.gif
@@ -2714,6 +2732,18 @@ share/PySolFC/images/toolbar/default/small/rules.gif
 share/PySolFC/images/toolbar/default/small/save.gif
 share/PySolFC/images/toolbar/default/small/statistics.gif
 share/PySolFC/images/toolbar/default/small/undo.gif
+share/PySolFC/images/toolbar/human/small/autodrop.png
+share/PySolFC/images/toolbar/human/small/new.png
+share/PySolFC/images/toolbar/human/small/open.png
+share/PySolFC/images/toolbar/human/small/pause.gif
+share/PySolFC/images/toolbar/human/small/quit.png
+share/PySolFC/images/toolbar/human/small/redo.png
+share/PySolFC/images/toolbar/human/small/restart.png
+share/PySolFC/images/toolbar/human/small/rules.png
+share/PySolFC/images/toolbar/human/small/save.png
+share/PySolFC/images/toolbar/human/small/shuffle.png
+share/PySolFC/images/toolbar/human/small/statistics.png
+share/PySolFC/images/toolbar/human/small/undo.png
 share/PySolFC/images/tree/emptynode.gif
 share/PySolFC/images/tree/folder.gif
 share/PySolFC/images/tree/minusnode.gif
@@ -2724,6 +2754,7 @@ share/PySolFC/images/tree/python.gif
 share/PySolFC/images/tree/tk.gif
 share/PySolFC/images/wizard.gif
 share/PySolFC/images/wizardcards.gif
+share/PySolFC/pysolfc.glade
 share/PySolFC/sound/areyousure.wav
 share/PySolFC/sound/autodrop.wav
 share/PySolFC/sound/autoflip.wav
@@ -2888,9 +2919,13 @@ share/PySolFC/tiles/Olive_Fossils.gif
 share/PySolFC/tiles/Orange_Ornaments.gif
 share/PySolFC/tiles/Pale_Satin.gif
 share/PySolFC/tiles/Rainbow.gif
+share/PySolFC/tiles/save-aspect/Paradise_Wide.jpg
 share/PySolFC/tiles/stretch/Blue_Fractal.jpg
 share/PySolFC/tiles/stretch/Castle.gif
 share/PySolFC/tiles/stretch/Sunset.gif
+share/applications/pysol.desktop
+share/icons/pysol01.png
+share/icons/pysol02.png
 share/locale/ru/LC_MESSAGES/pysol.mo
 share/locale/ru_RU/LC_MESSAGES/pysol.mo
 share/pixmaps/pysol.xbm
diff --git a/games/pysolfc/distinfo b/games/pysolfc/distinfo
index 1c83083c060..f51dc10fd0f 100644
--- a/games/pysolfc/distinfo
+++ b/games/pysolfc/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/09/12 19:45:29 snj Exp $
+$NetBSD: distinfo,v 1.3 2012/09/01 19:44:33 spz 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
+SHA1 (PySolFC-2.0.tar.bz2) = 7a11aa04b3f5147396c8b5011228094c10ddc257
+RMD160 (PySolFC-2.0.tar.bz2) = ea846061cdf2630257322b2e9eb7289b71d47705
+Size (PySolFC-2.0.tar.bz2) = 4208776 bytes
+SHA1 (patch-ab) = 36a74977a12e5610e89f25c9482a475fac06dace
diff --git a/games/pysolfc/patches/patch-aa b/games/pysolfc/patches/patch-aa
deleted file mode 100644
index 0357cfbef40..00000000000
--- a/games/pysolfc/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/16 07:12:09 snj Exp $
-
---- setup.py.orig	2008-11-15 13:57:18.000000000 -0800
-+++ setup.py	2008-11-15 13:57:25.000000000 -0800
-@@ -44,7 +44,6 @@ if os.name == 'posix':
-     for l in ('ru', 'ru_RU'):
-         data_files.append(('share/locale/%s/LC_MESSAGES' % l,
-                            ['locale/%s/LC_MESSAGES/pysol.mo' % l]))
--    data_files.append((data_dir, ['data/pysolfc.glade']))
- 
- ##from pprint import pprint; pprint(data_files)
- ##import sys; sys.exit()
diff --git a/games/pysolfc/patches/patch-ab b/games/pysolfc/patches/patch-ab
index 3f1f1b49bc5..910566b27d5 100644
--- a/games/pysolfc/patches/patch-ab
+++ b/games/pysolfc/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/11/16 07:12:09 snj Exp $
+$NetBSD: patch-ab,v 1.2 2012/09/01 19:44:33 spz Exp $
+
+pkgsrc'ification
 
 --- pysollib/settings.py.orig	2008-11-15 13:04:30.000000000 -0800
 +++ pysollib/settings.py	2008-11-15 13:05:05.000000000 -0800
diff --git a/games/pysolfc/patches/patch-ac b/games/pysolfc/patches/patch-ac
deleted file mode 100644
index 413279c4730..00000000000
--- a/games/pysolfc/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$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
- 
- 
- # /***********************************************************************