4 files changed, 257 insertions, 186 deletions

diff --git a/games/jools/Makefile b/games/jools/Makefile
index 2fb48ac079e9..0eeba540ee83 100644
--- a/games/jools/Makefile
+++ b/games/jools/Makefile
@@ -5,22 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	jools
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.20
 CATEGORIES=	games
 MASTER_SITES=	http://www.eecs.umich.edu/~pelzlpj/jools/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Addictive jewel-swapping puzzle game
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
 
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
-do-build:
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-
-do-install:
-	cd ${WRKSRC} && ${PYTHON_CMD} ${WRKSRC}/setup.py install --prefix=${PREFIX}
+post-patch:
+	@${FIND} ${WRKSRC} -name ".arch-ids" | ${XARGS} ${RM} -r
 
 .include <bsd.port.mk>
diff --git a/games/jools/distinfo b/games/jools/distinfo
index 6800e866cede..df64f47a48f2 100644
--- a/games/jools/distinfo
+++ b/games/jools/distinfo
@@ -1 +1 @@
-MD5 (jools-0.10.tar.gz) = 022f0240019957064b789ae1014f94f5
+MD5 (jools-0.20.tar.gz) = e84ba8b88b4b7ba52ff79f661b411729
diff --git a/games/jools/pkg-descr b/games/jools/pkg-descr
index 35bdba839a93..d3c0b6e820b3 100644
--- a/games/jools/pkg-descr
+++ b/games/jools/pkg-descr
@@ -1,6 +1,6 @@
-jools is a clone of Bejeweled, the gratuitously addictive puzzle game
-where you swap adjacent jewels.  This game is known by name names,
-and is part of Yahoo! Games under "Diamond Mine."
+jools is a clone of the PopCap! game Bejeweled, the gratuitously addictive
+puzzle game where you swap adjacent jewels.  This game is known by many
+names, and is part of Yahoo! Games under "Diamond Mine."
 
 WWW: http://www.eecs.umich.edu/~pelzlpj/jools/
 -Adam Weinberger <adamw@FreeBSD.org>
diff --git a/games/jools/pkg-plist b/games/jools/pkg-plist
index f2aa8a8f9337..1c3255b9a249 100644
--- a/games/jools/pkg-plist
+++ b/games/jools/pkg-plist
@@ -1,201 +1,273 @@
 bin/jools
 %%PYTHON_SITELIBDIR%%/jools/__init__.py
 %%PYTHON_SITELIBDIR%%/jools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/jools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/jools/audiostatus.py
+%%PYTHON_SITELIBDIR%%/jools/audiostatus.pyc
+%%PYTHON_SITELIBDIR%%/jools/audiostatus.pyo
 %%PYTHON_SITELIBDIR%%/jools/config.py
 %%PYTHON_SITELIBDIR%%/jools/config.pyc
+%%PYTHON_SITELIBDIR%%/jools/config.pyo
 %%PYTHON_SITELIBDIR%%/jools/globals.py
 %%PYTHON_SITELIBDIR%%/jools/globals.pyc
+%%PYTHON_SITELIBDIR%%/jools/globals.pyo
 %%PYTHON_SITELIBDIR%%/jools/grid.py
 %%PYTHON_SITELIBDIR%%/jools/grid.pyc
+%%PYTHON_SITELIBDIR%%/jools/grid.pyo
 %%PYTHON_SITELIBDIR%%/jools/highscore.py
 %%PYTHON_SITELIBDIR%%/jools/highscore.pyc
+%%PYTHON_SITELIBDIR%%/jools/highscore.pyo
 %%PYTHON_SITELIBDIR%%/jools/initialize.py
 %%PYTHON_SITELIBDIR%%/jools/initialize.pyc
+%%PYTHON_SITELIBDIR%%/jools/initialize.pyo
 %%PYTHON_SITELIBDIR%%/jools/inputbox.py
 %%PYTHON_SITELIBDIR%%/jools/inputbox.pyc
+%%PYTHON_SITELIBDIR%%/jools/inputbox.pyo
 %%PYTHON_SITELIBDIR%%/jools/intro.py
 %%PYTHON_SITELIBDIR%%/jools/intro.pyc
+%%PYTHON_SITELIBDIR%%/jools/intro.pyo
 %%PYTHON_SITELIBDIR%%/jools/jool.py
 %%PYTHON_SITELIBDIR%%/jools/jool.pyc
+%%PYTHON_SITELIBDIR%%/jools/jool.pyo
 %%PYTHON_SITELIBDIR%%/jools/joolsutils.py
 %%PYTHON_SITELIBDIR%%/jools/joolsutils.pyc
+%%PYTHON_SITELIBDIR%%/jools/joolsutils.pyo
+%%PYTHON_SITELIBDIR%%/jools/options.py
+%%PYTHON_SITELIBDIR%%/jools/options.pyc
+%%PYTHON_SITELIBDIR%%/jools/options.pyo
+%%PYTHON_SITELIBDIR%%/jools/playlist.py
+%%PYTHON_SITELIBDIR%%/jools/playlist.pyc
+%%PYTHON_SITELIBDIR%%/jools/playlist.pyo
+%%PYTHON_SITELIBDIR%%/jools/scoreboard.py
+%%PYTHON_SITELIBDIR%%/jools/scoreboard.pyc
+%%PYTHON_SITELIBDIR%%/jools/scoreboard.pyo
+%%PYTHON_SITELIBDIR%%/jools/sound.py
+%%PYTHON_SITELIBDIR%%/jools/sound.pyc
+%%PYTHON_SITELIBDIR%%/jools/sound.pyo
 %%PYTHON_SITELIBDIR%%/jools/timer.py
 %%PYTHON_SITELIBDIR%%/jools/timer.pyc
-share/jools/images/amethyst/0001.bmp
-share/jools/images/amethyst/0002.bmp
-share/jools/images/amethyst/0003.bmp
-share/jools/images/amethyst/0004.bmp
-share/jools/images/amethyst/0005.bmp
-share/jools/images/amethyst/0006.bmp
-share/jools/images/amethyst/0007.bmp
-share/jools/images/amethyst/0008.bmp
-share/jools/images/amethyst/0009.bmp
-share/jools/images/amethyst/0010.bmp
-share/jools/images/amethyst/0011.bmp
-share/jools/images/amethyst/0012.bmp
-share/jools/images/amethyst/0013.bmp
-share/jools/images/amethyst/0014.bmp
-share/jools/images/amethyst/0015.bmp
-share/jools/images/amethyst/0016.bmp
-share/jools/images/amethyst/0017.bmp
-share/jools/images/amethyst/0018.bmp
-share/jools/images/amethyst/0019.bmp
-share/jools/images/amethyst/0020.bmp
-share/jools/images/amethyst/0021.bmp
-share/jools/images/amethyst/0022.bmp
-share/jools/images/amethyst/0023.bmp
-share/jools/images/amethyst/0024.bmp
-share/jools/images/amethyst/0025.bmp
-share/jools/images/amethyst/0026.bmp
-share/jools/images/amethyst/0027.bmp
-share/jools/images/amethyst/0028.bmp
-share/jools/images/amethyst/0029.bmp
-share/jools/images/amethyst/0030.bmp
-share/jools/images/amethyst/0031.bmp
-share/jools/images/amethyst/0032.bmp
-share/jools/images/amethyst/0033.bmp
-share/jools/images/amethyst/0034.bmp
-share/jools/images/amethyst/0035.bmp
-share/jools/images/amethyst/0036.bmp
-share/jools/images/amethyst/0037.bmp
-share/jools/images/amethyst/0038.bmp
-share/jools/images/amethyst/0039.bmp
-share/jools/images/amethyst/0040.bmp
-share/jools/images/diamond/0001.bmp
-share/jools/images/diamond/0002.bmp
-share/jools/images/diamond/0003.bmp
-share/jools/images/diamond/0004.bmp
-share/jools/images/diamond/0005.bmp
-share/jools/images/diamond/0006.bmp
-share/jools/images/diamond/0007.bmp
-share/jools/images/diamond/0008.bmp
-share/jools/images/diamond/0009.bmp
-share/jools/images/diamond/0010.bmp
-share/jools/images/diamond/0011.bmp
-share/jools/images/diamond/0012.bmp
-share/jools/images/diamond/0013.bmp
-share/jools/images/diamond/0014.bmp
-share/jools/images/diamond/0015.bmp
-share/jools/images/diamond/0016.bmp
-share/jools/images/diamond/0017.bmp
-share/jools/images/diamond/0018.bmp
-share/jools/images/diamond/0019.bmp
-share/jools/images/diamond/0020.bmp
-share/jools/images/emerald/0001.bmp
-share/jools/images/emerald/0002.bmp
-share/jools/images/emerald/0003.bmp
-share/jools/images/emerald/0004.bmp
-share/jools/images/emerald/0005.bmp
-share/jools/images/emerald/0006.bmp
-share/jools/images/emerald/0007.bmp
-share/jools/images/emerald/0008.bmp
-share/jools/images/emerald/0009.bmp
-share/jools/images/emerald/0010.bmp
-share/jools/images/emerald/0011.bmp
-share/jools/images/emerald/0012.bmp
-share/jools/images/emerald/0013.bmp
-share/jools/images/emerald/0014.bmp
-share/jools/images/emerald/0015.bmp
-share/jools/images/emerald/0016.bmp
-share/jools/images/emerald/0017.bmp
-share/jools/images/emerald/0018.bmp
-share/jools/images/emerald/0019.bmp
-share/jools/images/emerald/0020.bmp
-share/jools/images/gameover.bmp
-share/jools/images/highscore.bmp
-share/jools/images/jools-logo-small.bmp
-share/jools/images/levelup.bmp
-share/jools/images/nomoves.bmp
-share/jools/images/orange/0001.bmp
-share/jools/images/orange/0002.bmp
-share/jools/images/orange/0003.bmp
-share/jools/images/orange/0004.bmp
-share/jools/images/orange/0005.bmp
-share/jools/images/orange/0006.bmp
-share/jools/images/orange/0007.bmp
-share/jools/images/orange/0008.bmp
-share/jools/images/orange/0009.bmp
-share/jools/images/orange/0010.bmp
-share/jools/images/orange/0011.bmp
-share/jools/images/orange/0012.bmp
-share/jools/images/orange/0013.bmp
-share/jools/images/orange/0014.bmp
-share/jools/images/orange/0015.bmp
-share/jools/images/orange/0016.bmp
-share/jools/images/orange/0017.bmp
-share/jools/images/orange/0018.bmp
-share/jools/images/orange/0019.bmp
-share/jools/images/orange/0020.bmp
-share/jools/images/paused.bmp
-share/jools/images/ruby/0001.bmp
-share/jools/images/ruby/0002.bmp
-share/jools/images/ruby/0003.bmp
-share/jools/images/ruby/0004.bmp
-share/jools/images/ruby/0005.bmp
-share/jools/images/ruby/0006.bmp
-share/jools/images/ruby/0007.bmp
-share/jools/images/ruby/0008.bmp
-share/jools/images/ruby/0009.bmp
-share/jools/images/ruby/0010.bmp
-share/jools/images/ruby/0011.bmp
-share/jools/images/ruby/0012.bmp
-share/jools/images/ruby/0013.bmp
-share/jools/images/ruby/0014.bmp
-share/jools/images/ruby/0015.bmp
-share/jools/images/ruby/0016.bmp
-share/jools/images/ruby/0017.bmp
-share/jools/images/ruby/0018.bmp
-share/jools/images/ruby/0019.bmp
-share/jools/images/ruby/0020.bmp
-share/jools/images/sapphire/0001.bmp
-share/jools/images/sapphire/0002.bmp
-share/jools/images/sapphire/0003.bmp
-share/jools/images/sapphire/0004.bmp
-share/jools/images/sapphire/0005.bmp
-share/jools/images/sapphire/0006.bmp
-share/jools/images/sapphire/0007.bmp
-share/jools/images/sapphire/0008.bmp
-share/jools/images/sapphire/0009.bmp
-share/jools/images/sapphire/0010.bmp
-share/jools/images/sapphire/0011.bmp
-share/jools/images/sapphire/0012.bmp
-share/jools/images/sapphire/0013.bmp
-share/jools/images/sapphire/0014.bmp
-share/jools/images/sapphire/0015.bmp
-share/jools/images/sapphire/0016.bmp
-share/jools/images/sapphire/0017.bmp
-share/jools/images/sapphire/0018.bmp
-share/jools/images/sapphire/0019.bmp
-share/jools/images/sapphire/0020.bmp
-share/jools/images/sphere/0001.bmp
-share/jools/images/sphere/0002.bmp
-share/jools/images/sphere/0003.bmp
-share/jools/images/sphere/0004.bmp
-share/jools/images/sphere/0005.bmp
-share/jools/images/sphere/0006.bmp
-share/jools/images/sphere/0007.bmp
-share/jools/images/sphere/0008.bmp
-share/jools/images/sphere/0009.bmp
-share/jools/images/sphere/0010.bmp
-share/jools/images/sphere/0011.bmp
-share/jools/images/sphere/0012.bmp
-share/jools/images/sphere/0013.bmp
-share/jools/images/sphere/0014.bmp
-share/jools/images/sphere/0015.bmp
-share/jools/images/sphere/0016.bmp
-share/jools/images/sphere/0017.bmp
-share/jools/images/sphere/0018.bmp
-share/jools/images/sphere/0019.bmp
-share/jools/images/sphere/0020.bmp
-share/jools/images/sphere/0021.bmp
-share/jools/images/timer-gradient.bmp
-share/jools/sounds/buzz.wav
-share/jools/sounds/click.wav
-share/jools/sounds/point1.wav
-share/jools/sounds/point2.wav
-share/jools/sounds/point3.wav
-share/jools/sounds/point4.wav
+%%PYTHON_SITELIBDIR%%/jools/timer.pyo
+share/jools/fonts/detonate.ttf
+share/jools/images/amethyst/0001.png
+share/jools/images/amethyst/0002.png
+share/jools/images/amethyst/0003.png
+share/jools/images/amethyst/0004.png
+share/jools/images/amethyst/0005.png
+share/jools/images/amethyst/0006.png
+share/jools/images/amethyst/0007.png
+share/jools/images/amethyst/0008.png
+share/jools/images/amethyst/0009.png
+share/jools/images/amethyst/0010.png
+share/jools/images/amethyst/0011.png
+share/jools/images/amethyst/0012.png
+share/jools/images/amethyst/0013.png
+share/jools/images/amethyst/0014.png
+share/jools/images/amethyst/0015.png
+share/jools/images/amethyst/0016.png
+share/jools/images/amethyst/0017.png
+share/jools/images/amethyst/0018.png
+share/jools/images/amethyst/0019.png
+share/jools/images/amethyst/0020.png
+share/jools/images/amethyst/0021.png
+share/jools/images/amethyst/0022.png
+share/jools/images/amethyst/0023.png
+share/jools/images/amethyst/0024.png
+share/jools/images/amethyst/0025.png
+share/jools/images/amethyst/0026.png
+share/jools/images/amethyst/0027.png
+share/jools/images/amethyst/0028.png
+share/jools/images/amethyst/0029.png
+share/jools/images/amethyst/0030.png
+share/jools/images/amethyst/0031.png
+share/jools/images/amethyst/0032.png
+share/jools/images/amethyst/0033.png
+share/jools/images/amethyst/0034.png
+share/jools/images/amethyst/0035.png
+share/jools/images/amethyst/0036.png
+share/jools/images/amethyst/0037.png
+share/jools/images/amethyst/0038.png
+share/jools/images/amethyst/0039.png
+share/jools/images/amethyst/0040.png
+share/jools/images/arrowdown.png
+share/jools/images/arrowup.png
+share/jools/images/back-button.png
+share/jools/images/back-button-on.png
+share/jools/images/diamond/0001.png
+share/jools/images/diamond/0002.png
+share/jools/images/diamond/0003.png
+share/jools/images/diamond/0004.png
+share/jools/images/diamond/0005.png
+share/jools/images/diamond/0006.png
+share/jools/images/diamond/0007.png
+share/jools/images/diamond/0008.png
+share/jools/images/diamond/0009.png
+share/jools/images/diamond/0010.png
+share/jools/images/diamond/0011.png
+share/jools/images/diamond/0012.png
+share/jools/images/diamond/0013.png
+share/jools/images/diamond/0014.png
+share/jools/images/diamond/0015.png
+share/jools/images/diamond/0016.png
+share/jools/images/diamond/0017.png
+share/jools/images/diamond/0018.png
+share/jools/images/diamond/0019.png
+share/jools/images/diamond/0020.png
+share/jools/images/emerald/0001.png
+share/jools/images/emerald/0002.png
+share/jools/images/emerald/0003.png
+share/jools/images/emerald/0004.png
+share/jools/images/emerald/0005.png
+share/jools/images/emerald/0006.png
+share/jools/images/emerald/0007.png
+share/jools/images/emerald/0008.png
+share/jools/images/emerald/0009.png
+share/jools/images/emerald/0010.png
+share/jools/images/emerald/0011.png
+share/jools/images/emerald/0012.png
+share/jools/images/emerald/0013.png
+share/jools/images/emerald/0014.png
+share/jools/images/emerald/0015.png
+share/jools/images/emerald/0016.png
+share/jools/images/emerald/0017.png
+share/jools/images/emerald/0018.png
+share/jools/images/emerald/0019.png
+share/jools/images/emerald/0020.png
+share/jools/images/gameover.png
+share/jools/images/highscore.png
+share/jools/images/jools-logo-large.png
+share/jools/images/jools-logo-small.png
+share/jools/images/levelup.png
+share/jools/images/loading.png
+share/jools/images/megaphone-off.png
+share/jools/images/megaphone-on.png
+share/jools/images/nomoves.png
+share/jools/images/notes-off.png
+share/jools/images/notes-on.png
+share/jools/images/options-button.png
+share/jools/images/options-button-on.png
+share/jools/images/orange/0001.png
+share/jools/images/orange/0002.png
+share/jools/images/orange/0003.png
+share/jools/images/orange/0004.png
+share/jools/images/orange/0005.png
+share/jools/images/orange/0006.png
+share/jools/images/orange/0007.png
+share/jools/images/orange/0008.png
+share/jools/images/orange/0009.png
+share/jools/images/orange/0010.png
+share/jools/images/orange/0011.png
+share/jools/images/orange/0012.png
+share/jools/images/orange/0013.png
+share/jools/images/orange/0014.png
+share/jools/images/orange/0015.png
+share/jools/images/orange/0016.png
+share/jools/images/orange/0017.png
+share/jools/images/orange/0018.png
+share/jools/images/orange/0019.png
+share/jools/images/orange/0020.png
+share/jools/images/paused.png
+share/jools/images/quit-button.png
+share/jools/images/quit-button-on.png
+share/jools/images/ruby/0001.png
+share/jools/images/ruby/0002.png
+share/jools/images/ruby/0003.png
+share/jools/images/ruby/0004.png
+share/jools/images/ruby/0005.png
+share/jools/images/ruby/0006.png
+share/jools/images/ruby/0007.png
+share/jools/images/ruby/0008.png
+share/jools/images/ruby/0009.png
+share/jools/images/ruby/0010.png
+share/jools/images/ruby/0011.png
+share/jools/images/ruby/0012.png
+share/jools/images/ruby/0013.png
+share/jools/images/ruby/0014.png
+share/jools/images/ruby/0015.png
+share/jools/images/ruby/0016.png
+share/jools/images/ruby/0017.png
+share/jools/images/ruby/0018.png
+share/jools/images/ruby/0019.png
+share/jools/images/ruby/0020.png
+share/jools/images/sapphire/0001.png
+share/jools/images/sapphire/0002.png
+share/jools/images/sapphire/0003.png
+share/jools/images/sapphire/0004.png
+share/jools/images/sapphire/0005.png
+share/jools/images/sapphire/0006.png
+share/jools/images/sapphire/0007.png
+share/jools/images/sapphire/0008.png
+share/jools/images/sapphire/0009.png
+share/jools/images/sapphire/0010.png
+share/jools/images/sapphire/0011.png
+share/jools/images/sapphire/0012.png
+share/jools/images/sapphire/0013.png
+share/jools/images/sapphire/0014.png
+share/jools/images/sapphire/0015.png
+share/jools/images/sapphire/0016.png
+share/jools/images/sapphire/0017.png
+share/jools/images/sapphire/0018.png
+share/jools/images/sapphire/0019.png
+share/jools/images/sapphire/0020.png
+share/jools/images/scale.png
+share/jools/images/scores-button.png
+share/jools/images/scores-button-on.png
+share/jools/images/slider.png
+share/jools/images/sphere/0001.png
+share/jools/images/sphere/0002.png
+share/jools/images/sphere/0003.png
+share/jools/images/sphere/0004.png
+share/jools/images/sphere/0005.png
+share/jools/images/sphere/0006.png
+share/jools/images/sphere/0007.png
+share/jools/images/sphere/0008.png
+share/jools/images/sphere/0009.png
+share/jools/images/sphere/0010.png
+share/jools/images/sphere/0011.png
+share/jools/images/sphere/0012.png
+share/jools/images/sphere/0013.png
+share/jools/images/sphere/0014.png
+share/jools/images/sphere/0015.png
+share/jools/images/sphere/0016.png
+share/jools/images/sphere/0017.png
+share/jools/images/sphere/0018.png
+share/jools/images/sphere/0019.png
+share/jools/images/sphere/0020.png
+share/jools/images/sphere/0021.png
+share/jools/images/test-button.png
+share/jools/images/test-button-on.png
+share/jools/images/timer-gradient.png
+share/jools/images/timetrial-button.png
+share/jools/images/timetrial-button-on.png
+share/jools/images/untimed-button.png
+share/jools/images/untimed-button-on.png
+share/jools/music/timed/.placeholder
+share/jools/music/title/.placeholder
+share/jools/music/untimed/.placeholder
+share/jools/sounds/00/buzz.wav
+share/jools/sounds/00/click.wav
+share/jools/sounds/00/levelup.wav
+share/jools/sounds/00/point1.wav
+share/jools/sounds/00/point2.wav
+share/jools/sounds/00/point3.wav
+share/jools/sounds/00/point4.wav
+share/jools/sounds/00/point5.wav
+share/jools/sounds/00/point6.wav
+share/jools/sounds/01/buzz.wav
+share/jools/sounds/01/click.wav
+share/jools/sounds/01/levelup.wav
+share/jools/sounds/01/point1.wav
+share/jools/sounds/01/point2.wav
+share/jools/sounds/01/point3.wav
+share/jools/sounds/01/point4.wav
+share/jools/sounds/01/point5.wav
+share/jools/sounds/01/point6.wav
+@dirrm share/jools/sounds/01
+@dirrm share/jools/sounds/00
 @dirrm share/jools/sounds
+@dirrm share/jools/music/untimed
+@dirrm share/jools/music/title
+@dirrm share/jools/music/timed
+@dirrm share/jools/music
 @dirrm share/jools/images/sphere
 @dirrm share/jools/images/sapphire
 @dirrm share/jools/images/ruby
@@ -204,4 +276,6 @@ share/jools/sounds/point4.wav
 @dirrm share/jools/images/diamond
 @dirrm share/jools/images/amethyst
 @dirrm share/jools/images
+@dirrm share/jools/fonts
+@dirrm share/jools
 @dirrm %%PYTHON_SITELIBDIR%%/jools