4 files changed, 246 insertions, 13 deletions

diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 37212b12b122..f3640bdde711 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -8,31 +8,41 @@
 PORTNAME=	pysol
 PORTVERSION=	4.82
 CATEGORIES=	games
-MASTER_SITES=	http://www.pysol.org/download/pysol/
+MASTER_SITES=	http://www.pysol.org/download/pysol/:source \
+		${MASTER_SITE_LOCAL:S/$/:support/}
+MASTER_SITE_SUBDIR=	tg/:support
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:support \
+		${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}:source
 
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	Solitaire game, written in Python
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
-
-BROKEN=		Incomplete pkg-plist
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysolsoundserver.so:${PORTSDIR}/audio/pysol-sound-server \
+		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_BZIP2=	yes
-USE_PYTHON=	-2.3
-
+USE_PYTHON=	yes
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 
 MAN6=		pysol.6
 
-do-install:
-	${SED}	-e "s|@pkgdatadir@|${PREFIX}/share/pysol|" \
+post-patch:
+	@${RM} ${WRKSRC}/src/tk/soundoptionsdialog.py.orig
+	@${REINPLACE_CMD} -e "s|@pkgdatadir@|${DATADIR}|" \
 		-e "s|@prefix@|${PREFIX}|" \
-		-e "s|@PYTHON@|${PYTHON_CMD}|" \
-		< ${WRKSRC}/pysol > ${WRKDIR}/pysol
-	${INSTALL_SCRIPT} ${WRKDIR}/pysol ${PREFIX}/bin/pysol
+		-e "s|@PYTHON@|${PYTHON_CMD}|" ${WRKSRC}/pysol
+	@${REINPLACE_CMD} -e "s|pysol_\$$PYVER.pyc|src/pysol.py|" \
+		${WRKSRC}/pysol
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/pysol ${PREFIX}/bin/pysol
 	${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/man/man6
-	@${MKDIR} ${PREFIX}/share/pysol
+	@${MKDIR} ${DATADIR}
 	(cd ${WRKSRC}/data; tar -cf - .) | \
-		(cd ${PREFIX}/share/pysol; tar --unlink -xf -)
+		(cd ${DATADIR}; tar --unlink -xf -)
+	(cd ${WRKSRC}; tar -cf - src) | \
+		(cd ${DATADIR}; tar --unlink -xf -)
+	@cd ${DATADIR} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py src
 
 .include <bsd.port.mk>
diff --git a/games/pysol/distinfo b/games/pysol/distinfo
index 48299d452439..c804a0d89582 100644
--- a/games/pysol/distinfo
+++ b/games/pysol/distinfo
@@ -1,2 +1,4 @@
 MD5 (pysol-4.82.tar.bz2) = 31a3ed96c6feb54717c6bce9ddd82b24
 SIZE (pysol-4.82.tar.bz2) = 3586977
+MD5 (pysol-4.82-src.tar.bz2) = be0fd45c016fe2dcacb03fb29871aff4
+SIZE (pysol-4.82-src.tar.bz2) = 150515
diff --git a/games/pysol/files/patch-src::tk::soundoptionsdialog.py b/games/pysol/files/patch-src::tk::soundoptionsdialog.py
new file mode 100644
index 000000000000..8936cc8ec17f
--- /dev/null
+++ b/games/pysol/files/patch-src::tk::soundoptionsdialog.py
@@ -0,0 +1,23 @@
+--- src/tk/soundoptionsdialog.py.orig	2004-12-04 15:33:34.218987696 +0200
++++ src/tk/soundoptionsdialog.py	2004-12-04 15:29:08.306412552 +0200
+@@ -47,6 +47,11 @@
+ from tkconst import EVENT_HANDLED, EVENT_PROPAGATE
+ from tkwidget import _ToplevelDialog, MfxDialog
+ 
++def bool2int(b):
++    if b:
++        return 1
++    else:
++        return 0
+ 
+ # /***********************************************************************
+ # //
+@@ -114,7 +119,7 @@
+ 
+     def mDone(self, button):
+         if button == 0 or button == 1:
+-            self.app.opt.sound = self.sound.get()
++            self.app.opt.sound = bool2int(self.sound.get())
+             self.app.opt.sound_mode = self.sound_mode.get()
+             self.app.opt.sound_sample_volume = self.sample_volume.get()
+             self.app.opt.sound_music_volume = self.music_volume.get()
diff --git a/games/pysol/pkg-plist b/games/pysol/pkg-plist
index e21ebd3576e6..d4e5953d7662 100644
--- a/games/pysol/pkg-plist
+++ b/games/pysol/pkg-plist
@@ -996,6 +996,199 @@ share/pysol/pysol_20.pyc
 share/pysol/pysol_21.pyc
 share/pysol/pysol_22.pyc
 share/pysol/pysol_23.pyc
+share/pysol/src/.gdbinit
+share/pysol/src/acard.py
+share/pysol/src/acard.pyc
+share/pysol/src/actions.py
+share/pysol/src/actions.pyc
+share/pysol/src/app.py
+share/pysol/src/app.pyc
+share/pysol/src/game.py
+share/pysol/src/game.pyc
+share/pysol/src/gamedb.py
+share/pysol/src/gamedb.pyc
+share/pysol/src/games/Makefile
+share/pysol/src/games/acesup.py
+share/pysol/src/games/acesup.pyc
+share/pysol/src/games/auldlangsyne.py
+share/pysol/src/games/auldlangsyne.pyc
+share/pysol/src/games/bakersdozen.py
+share/pysol/src/games/bakersdozen.pyc
+share/pysol/src/games/bakersgame.py
+share/pysol/src/games/bakersgame.pyc
+share/pysol/src/games/beleagueredcastle.py
+share/pysol/src/games/beleagueredcastle.pyc
+share/pysol/src/games/braid.py
+share/pysol/src/games/braid.pyc
+share/pysol/src/games/bristol.py
+share/pysol/src/games/bristol.pyc
+share/pysol/src/games/calculation.py
+share/pysol/src/games/calculation.pyc
+share/pysol/src/games/canfield.py
+share/pysol/src/games/canfield.pyc
+share/pysol/src/games/contrib/Makefile
+share/pysol/src/games/contrib/larasgame.py
+share/pysol/src/games/contrib/larasgame.pyc
+share/pysol/src/games/contrib/sanibel.py
+share/pysol/src/games/contrib/sanibel.pyc
+share/pysol/src/games/dieboesesieben.py
+share/pysol/src/games/dieboesesieben.pyc
+share/pysol/src/games/diplomat.py
+share/pysol/src/games/diplomat.pyc
+share/pysol/src/games/doublets.py
+share/pysol/src/games/doublets.pyc
+share/pysol/src/games/eiffeltower.py
+share/pysol/src/games/eiffeltower.pyc
+share/pysol/src/games/fan.py
+share/pysol/src/games/fan.pyc
+share/pysol/src/games/fortythieves.py
+share/pysol/src/games/fortythieves.pyc
+share/pysol/src/games/freecell.py
+share/pysol/src/games/freecell.pyc
+share/pysol/src/games/golf.py
+share/pysol/src/games/golf.pyc
+share/pysol/src/games/grandfathersclock.py
+share/pysol/src/games/grandfathersclock.pyc
+share/pysol/src/games/gypsy.py
+share/pysol/src/games/gypsy.pyc
+share/pysol/src/games/harp.py
+share/pysol/src/games/harp.pyc
+share/pysol/src/games/katzenschwanz.py
+share/pysol/src/games/katzenschwanz.pyc
+share/pysol/src/games/klondike.py
+share/pysol/src/games/klondike.pyc
+share/pysol/src/games/matriarchy.py
+share/pysol/src/games/matriarchy.pyc
+share/pysol/src/games/montana.py
+share/pysol/src/games/montana.pyc
+share/pysol/src/games/montecarlo.py
+share/pysol/src/games/montecarlo.pyc
+share/pysol/src/games/napoleon.py
+share/pysol/src/games/napoleon.pyc
+share/pysol/src/games/numerica.py
+share/pysol/src/games/numerica.pyc
+share/pysol/src/games/osmosis.py
+share/pysol/src/games/osmosis.pyc
+share/pysol/src/games/pasdedeux.py
+share/pysol/src/games/pasdedeux.pyc
+share/pysol/src/games/picturegallery.py
+share/pysol/src/games/picturegallery.pyc
+share/pysol/src/games/pileon.py
+share/pysol/src/games/pileon.pyc
+share/pysol/src/games/poker.py
+share/pysol/src/games/poker.pyc
+share/pysol/src/games/pyramid.py
+share/pysol/src/games/pyramid.pyc
+share/pysol/src/games/royalcotillion.py
+share/pysol/src/games/royalcotillion.pyc
+share/pysol/src/games/royaleast.py
+share/pysol/src/games/royaleast.pyc
+share/pysol/src/games/siebenbisas.py
+share/pysol/src/games/siebenbisas.pyc
+share/pysol/src/games/special/Makefile
+share/pysol/src/games/special/hanafuda.py
+share/pysol/src/games/special/hanafuda.pyc
+share/pysol/src/games/special/hanoi.py
+share/pysol/src/games/special/hanoi.pyc
+share/pysol/src/games/special/hexadeck.py
+share/pysol/src/games/special/hexadeck.pyc
+share/pysol/src/games/special/memory.py
+share/pysol/src/games/special/memory.pyc
+share/pysol/src/games/special/pegged.py
+share/pysol/src/games/special/pegged.pyc
+share/pysol/src/games/special/tarock.py
+share/pysol/src/games/special/tarock.pyc
+share/pysol/src/games/spider.py
+share/pysol/src/games/spider.pyc
+share/pysol/src/games/terrace.py
+share/pysol/src/games/terrace.pyc
+share/pysol/src/games/unionsquare.py
+share/pysol/src/games/unionsquare.pyc
+share/pysol/src/games/windmill.py
+share/pysol/src/games/windmill.pyc
+share/pysol/src/games/yukon.py
+share/pysol/src/games/yukon.pyc
+share/pysol/src/help.py
+share/pysol/src/help.pyc
+share/pysol/src/hint.py
+share/pysol/src/hint.pyc
+share/pysol/src/images.py
+share/pysol/src/images.pyc
+share/pysol/src/layout.py
+share/pysol/src/layout.pyc
+share/pysol/src/main.py
+share/pysol/src/main.pyc
+share/pysol/src/mfxtools.py
+share/pysol/src/mfxtools.pyc
+share/pysol/src/mfxutil.py
+share/pysol/src/mfxutil.pyc
+share/pysol/src/move.py
+share/pysol/src/move.pyc
+share/pysol/src/pysol.py
+share/pysol/src/pysol.pyc
+share/pysol/src/pysolaudio.py
+share/pysol/src/pysolaudio.pyc
+share/pysol/src/pysoltk.py
+share/pysol/src/pysoltk.pyc
+share/pysol/src/random.py
+share/pysol/src/random.pyc
+share/pysol/src/resource.py
+share/pysol/src/resource.pyc
+share/pysol/src/stack.py
+share/pysol/src/stack.pyc
+share/pysol/src/stats.py
+share/pysol/src/stats.pyc
+share/pysol/src/tk/Makefile
+share/pysol/src/tk/card.py
+share/pysol/src/tk/card.pyc
+share/pysol/src/tk/demooptionsdialog.py
+share/pysol/src/tk/demooptionsdialog.pyc
+share/pysol/src/tk/edittextdialog.py
+share/pysol/src/tk/edittextdialog.pyc
+share/pysol/src/tk/menubar.py
+share/pysol/src/tk/menubar.pyc
+share/pysol/src/tk/playeroptionsdialog.py
+share/pysol/src/tk/playeroptionsdialog.pyc
+share/pysol/src/tk/progressbar.py
+share/pysol/src/tk/progressbar.pyc
+share/pysol/src/tk/selectcardset.py
+share/pysol/src/tk/selectcardset.pyc
+share/pysol/src/tk/selectgame.py
+share/pysol/src/tk/selectgame.pyc
+share/pysol/src/tk/selecttile.py
+share/pysol/src/tk/selecttile.pyc
+share/pysol/src/tk/selecttree.py
+share/pysol/src/tk/selecttree.pyc
+share/pysol/src/tk/soundoptionsdialog.py
+share/pysol/src/tk/soundoptionsdialog.pyc
+share/pysol/src/tk/statusbar.py
+share/pysol/src/tk/statusbar.pyc
+share/pysol/src/tk/tkcanvas.py
+share/pysol/src/tk/tkcanvas.pyc
+share/pysol/src/tk/tkconst.py
+share/pysol/src/tk/tkconst.pyc
+share/pysol/src/tk/tkfont.py
+share/pysol/src/tk/tkfont.pyc
+share/pysol/src/tk/tkhtml.py
+share/pysol/src/tk/tkhtml.pyc
+share/pysol/src/tk/tkinit.py
+share/pysol/src/tk/tkinit.pyc
+share/pysol/src/tk/tkstats.py
+share/pysol/src/tk/tkstats.pyc
+share/pysol/src/tk/tktree.py
+share/pysol/src/tk/tktree.pyc
+share/pysol/src/tk/tkutil.py
+share/pysol/src/tk/tkutil.pyc
+share/pysol/src/tk/tkwidget.py
+share/pysol/src/tk/tkwidget.pyc
+share/pysol/src/tk/tkwrap.py
+share/pysol/src/tk/tkwrap.pyc
+share/pysol/src/tk/toolbar.py
+share/pysol/src/tk/toolbar.pyc
+share/pysol/src/util.py
+share/pysol/src/util.pyc
+share/pysol/src/version.py
+share/pysol/src/version.pyc
 share/pysol/sound/autodrop.wav
 share/pysol/sound/autoflip.wav
 share/pysol/sound/deal01.wav
@@ -1062,6 +1255,11 @@ share/pysol/toolbar/small/undo.gif
 @dirrm share/pysol/tiles
 @dirrm share/pysol/sound/extra
 @dirrm share/pysol/sound
+@dirrm share/pysol/src/tk
+@dirrm share/pysol/src/games/special
+@dirrm share/pysol/src/games/contrib
+@dirrm share/pysol/src/games
+@dirrm share/pysol/src
 @dirrm share/pysol/plugins
 @dirrm share/pysol/music
 @dirrm share/pysol/images/tree