Upgrade to 4.60. Additional music files and cardsets are moved

from an option to separate ports (to be imported shortly).

Partly submitted by:	sobomax

4 files changed, 179 insertions, 228 deletions

diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 71a47c83987e..38dc086101e3 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -6,73 +6,39 @@
 #
 
 PORTNAME=	pysol
-PORTVERSION=	4.41
+PORTVERSION=	4.60
 CATEGORIES=	games
-MASTER_SITES=	http://wildsau.idv.uni-linz.ac.at/mfx/download/pysol/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${CARDSETS_DISTFILE} \
-		${MUSIC_DISTFILE}
+MASTER_SITES=	http://wildsau.idv.uni-linz.ac.at/mfx/download/pysol/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	tg
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pysol.py.bz2
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tg@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${SOUND_DEPENDS}
+BUILD_DEPENDS=	bunzip2:${PORTSDIR}/archivers/bzip2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-NO_BUILD=	yes
-PLIST=		${WRKDIR}/PLIST
-
-CARDSETS=	pysol-cardsets-4.20
-MUSIC=		pysol-music-4.30
-
-.if !defined(WITHOUT_CARDSETS)
-CARDSETS_DISTFILE=${CARDSETS}${EXTRACT_SUFX}
-PLISTS+=	${PKGDIR}/PLIST.cardsets
-.else
-CARDSETS_DISTFILE=
-.endif
-
-.if defined(WITH_SOUND)
-SOUND_DEPENDS=	${LOCALBASE}/lib/python1.5/site-packages/pysolsoundservermodule.so:${PORTSDIR}/audio/pysol-sound-server
-MUSIC_DISTFILE=	${MUSIC}${EXTRACT_SUFX}
-PLISTS+=	${PKGDIR}/PLIST.music
-.else
-SOUND_DEPENDS=
-MISIC_DISTFILE=
-.endif
-
-PLISTS+=	${PKGDIR}/PLIST
+USE_PYTHON=	yes
 
 MAN6=		pysol.6
 
-.if !defined(WITHOUT_CARDSETS)
-pre-fetch:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you do not want to download/install optional cardsets (12MB) please use"
-	@${ECHO_MSG} "\"make -DWITHOUT_CARDSETS\" instead."
-	@${ECHO_MSG}
-.endif
-
-.if !defined(WITH_SOUND)
 post-extract:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want install sound support please use \"make -DWITH_SOUND\""
-	@${ECHO_MSG}
-.endif
+	${LOCALBASE}/bin/bunzip2 -c ${DISTDIR}/pysol.py.bz2 \
+		> ${WRKSRC}/pysol.py
+
+do-build:
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${WRKSRC}
 
 do-install:
-	${SED} -e "s|@pkgdatadir@|${PREFIX}/share/pysol|" < ${WRKSRC}/pysol > ${PREFIX}/bin/pysol
+	${SED}	-e "s|@pkgdatadir@|${PREFIX}/share/pysol|" \
+		-e "s|^exec python|exec ${PYTHON_CMD}|" \
+		< ${WRKSRC}/pysol > ${PREFIX}/bin/pysol
 	${CHMOD} +x ${PREFIX}/bin/pysol
 	${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/man/man6
 	@${MKDIR} ${PREFIX}/share/pysol
 	(cd ${WRKSRC}/data; tar cf - *) | \
 		(cd ${PREFIX}/share/pysol; tar xf -)
-.if !defined(WITHOUT_CARDSETS)
-	(cd ${WRKDIR}/${CARDSETS}/data; tar cf - *) | \
-		(cd ${PREFIX}/share/pysol; tar xf -)
-.endif
-.if defined(WITH_SOUND)
-	(cd ${WRKDIR}/${MUSIC}/data; tar cf - *) | \
-		(cd ${PREFIX}/share/pysol; tar xf -)
-.endif
-	@cat ${PLISTS} > ${PLIST}
+	${INSTALL_DATA} ${WRKSRC}/pysol.pyc ${PREFIX}/share/pysol
 
 .include <bsd.port.mk>
diff --git a/games/pysol/distinfo b/games/pysol/distinfo
index a653dc6dafc8..2336cc549c70 100644
--- a/games/pysol/distinfo
+++ b/games/pysol/distinfo
@@ -1,3 +1,2 @@
-MD5 (pysol-4.41.tar.gz) = edc810be18c7189d03a9ded172ce83f9
-MD5 (pysol-cardsets-4.20.tar.gz) = 534b13f91eb33cdf1438c76e0954b33b
-MD5 (pysol-music-4.30.tar.gz) = 695744afc5d437df103622991c400a80
+MD5 (pysol-4.60.tar.gz) = ca07612bb1c7c604111e11f49abefda7
+MD5 (pysol.py.bz2) = 8a5bfdb0b675a8fbecedad1d06240d11
diff --git a/games/pysol/pkg-descr b/games/pysol/pkg-descr
index 17c63f2997ba..373bf94d5476 100644
--- a/games/pysol/pkg-descr
+++ b/games/pysol/pkg-descr
@@ -3,7 +3,7 @@ PySol - a Python Solitaire Game
 Highlights:
 -----------
   - based upon an extensible solitaire engine
-  - currently supports 298 different games - expect more to come
+  - currently supports 201 different games - expect more to come
   - includes my all time favorite "Gypsy"
   - very nice look and feel
   - unlimited undo & redo
diff --git a/games/pysol/pkg-plist b/games/pysol/pkg-plist
index f02dd208dbc9..42637f0e9f9a 100644
--- a/games/pysol/pkg-plist
+++ b/games/pysol/pkg-plist
@@ -89,6 +89,87 @@ share/pysol/cardset-2000/shadow10.gif
 share/pysol/cardset-2000/shadow11.gif
 share/pysol/cardset-2000/shadow12.gif
 share/pysol/cardset-2000/shadow13.gif
+share/pysol/cardset-colossus/01c.gif
+share/pysol/cardset-colossus/01d.gif
+share/pysol/cardset-colossus/01h.gif
+share/pysol/cardset-colossus/01s.gif
+share/pysol/cardset-colossus/02c.gif
+share/pysol/cardset-colossus/02d.gif
+share/pysol/cardset-colossus/02h.gif
+share/pysol/cardset-colossus/02s.gif
+share/pysol/cardset-colossus/03c.gif
+share/pysol/cardset-colossus/03d.gif
+share/pysol/cardset-colossus/03h.gif
+share/pysol/cardset-colossus/03s.gif
+share/pysol/cardset-colossus/04c.gif
+share/pysol/cardset-colossus/04d.gif
+share/pysol/cardset-colossus/04h.gif
+share/pysol/cardset-colossus/04s.gif
+share/pysol/cardset-colossus/05c.gif
+share/pysol/cardset-colossus/05d.gif
+share/pysol/cardset-colossus/05h.gif
+share/pysol/cardset-colossus/05s.gif
+share/pysol/cardset-colossus/06c.gif
+share/pysol/cardset-colossus/06d.gif
+share/pysol/cardset-colossus/06h.gif
+share/pysol/cardset-colossus/06s.gif
+share/pysol/cardset-colossus/07c.gif
+share/pysol/cardset-colossus/07d.gif
+share/pysol/cardset-colossus/07h.gif
+share/pysol/cardset-colossus/07s.gif
+share/pysol/cardset-colossus/08c.gif
+share/pysol/cardset-colossus/08d.gif
+share/pysol/cardset-colossus/08h.gif
+share/pysol/cardset-colossus/08s.gif
+share/pysol/cardset-colossus/09c.gif
+share/pysol/cardset-colossus/09d.gif
+share/pysol/cardset-colossus/09h.gif
+share/pysol/cardset-colossus/09s.gif
+share/pysol/cardset-colossus/10c.gif
+share/pysol/cardset-colossus/10d.gif
+share/pysol/cardset-colossus/10h.gif
+share/pysol/cardset-colossus/10s.gif
+share/pysol/cardset-colossus/11c.gif
+share/pysol/cardset-colossus/11d.gif
+share/pysol/cardset-colossus/11h.gif
+share/pysol/cardset-colossus/11s.gif
+share/pysol/cardset-colossus/12c.gif
+share/pysol/cardset-colossus/12d.gif
+share/pysol/cardset-colossus/12h.gif
+share/pysol/cardset-colossus/12s.gif
+share/pysol/cardset-colossus/13c.gif
+share/pysol/cardset-colossus/13d.gif
+share/pysol/cardset-colossus/13h.gif
+share/pysol/cardset-colossus/13s.gif
+share/pysol/cardset-colossus/COPYRIGHT
+share/pysol/cardset-colossus/back01.gif
+share/pysol/cardset-colossus/bottom01.gif
+share/pysol/cardset-colossus/bottom02.gif
+share/pysol/cardset-colossus/bottom03.gif
+share/pysol/cardset-colossus/bottom04.gif
+share/pysol/cardset-colossus/bottom05.gif
+share/pysol/cardset-colossus/bottom06.gif
+share/pysol/cardset-colossus/bottom07.gif
+share/pysol/cardset-colossus/config.txt
+share/pysol/cardset-colossus/l01.gif
+share/pysol/cardset-colossus/l02.gif
+share/pysol/cardset-colossus/l03.gif
+share/pysol/cardset-colossus/l04.gif
+share/pysol/cardset-colossus/shade.gif
+share/pysol/cardset-colossus/shadow00.gif
+share/pysol/cardset-colossus/shadow01.gif
+share/pysol/cardset-colossus/shadow02.gif
+share/pysol/cardset-colossus/shadow03.gif
+share/pysol/cardset-colossus/shadow04.gif
+share/pysol/cardset-colossus/shadow05.gif
+share/pysol/cardset-colossus/shadow06.gif
+share/pysol/cardset-colossus/shadow07.gif
+share/pysol/cardset-colossus/shadow08.gif
+share/pysol/cardset-colossus/shadow09.gif
+share/pysol/cardset-colossus/shadow10.gif
+share/pysol/cardset-colossus/shadow11.gif
+share/pysol/cardset-colossus/shadow12.gif
+share/pysol/cardset-colossus/shadow13.gif
 share/pysol/cardset-hard-a-port/01c.gif
 share/pysol/cardset-hard-a-port/01d.gif
 share/pysol/cardset-hard-a-port/01h.gif
@@ -270,77 +351,6 @@ share/pysol/cardset-hexadeck/shadow10.gif
 share/pysol/cardset-hexadeck/shadow11.gif
 share/pysol/cardset-hexadeck/shadow12.gif
 share/pysol/cardset-hexadeck/shadow13.gif
-share/pysol/cardset-ivory-mahjongg-small/01a.gif
-share/pysol/cardset-ivory-mahjongg-small/01b.gif
-share/pysol/cardset-ivory-mahjongg-small/01c.gif
-share/pysol/cardset-ivory-mahjongg-small/01z.gif
-share/pysol/cardset-ivory-mahjongg-small/02a.gif
-share/pysol/cardset-ivory-mahjongg-small/02b.gif
-share/pysol/cardset-ivory-mahjongg-small/02c.gif
-share/pysol/cardset-ivory-mahjongg-small/02z.gif
-share/pysol/cardset-ivory-mahjongg-small/03a.gif
-share/pysol/cardset-ivory-mahjongg-small/03b.gif
-share/pysol/cardset-ivory-mahjongg-small/03c.gif
-share/pysol/cardset-ivory-mahjongg-small/03z.gif
-share/pysol/cardset-ivory-mahjongg-small/04a.gif
-share/pysol/cardset-ivory-mahjongg-small/04b.gif
-share/pysol/cardset-ivory-mahjongg-small/04c.gif
-share/pysol/cardset-ivory-mahjongg-small/04z.gif
-share/pysol/cardset-ivory-mahjongg-small/05a.gif
-share/pysol/cardset-ivory-mahjongg-small/05b.gif
-share/pysol/cardset-ivory-mahjongg-small/05c.gif
-share/pysol/cardset-ivory-mahjongg-small/05z.gif
-share/pysol/cardset-ivory-mahjongg-small/06a.gif
-share/pysol/cardset-ivory-mahjongg-small/06b.gif
-share/pysol/cardset-ivory-mahjongg-small/06c.gif
-share/pysol/cardset-ivory-mahjongg-small/06z.gif
-share/pysol/cardset-ivory-mahjongg-small/07a.gif
-share/pysol/cardset-ivory-mahjongg-small/07b.gif
-share/pysol/cardset-ivory-mahjongg-small/07c.gif
-share/pysol/cardset-ivory-mahjongg-small/07z.gif
-share/pysol/cardset-ivory-mahjongg-small/08a.gif
-share/pysol/cardset-ivory-mahjongg-small/08b.gif
-share/pysol/cardset-ivory-mahjongg-small/08c.gif
-share/pysol/cardset-ivory-mahjongg-small/08z.gif
-share/pysol/cardset-ivory-mahjongg-small/09a.gif
-share/pysol/cardset-ivory-mahjongg-small/09b.gif
-share/pysol/cardset-ivory-mahjongg-small/09c.gif
-share/pysol/cardset-ivory-mahjongg-small/09z.gif
-share/pysol/cardset-ivory-mahjongg-small/10a.gif
-share/pysol/cardset-ivory-mahjongg-small/10b.gif
-share/pysol/cardset-ivory-mahjongg-small/10c.gif
-share/pysol/cardset-ivory-mahjongg-small/10z.gif
-share/pysol/cardset-ivory-mahjongg-small/11z.gif
-share/pysol/cardset-ivory-mahjongg-small/12z.gif
-share/pysol/cardset-ivory-mahjongg-small/COPYRIGHT
-share/pysol/cardset-ivory-mahjongg-small/back01.gif
-share/pysol/cardset-ivory-mahjongg-small/bottom01.gif
-share/pysol/cardset-ivory-mahjongg-small/bottom02.gif
-share/pysol/cardset-ivory-mahjongg-small/bottom03.gif
-share/pysol/cardset-ivory-mahjongg-small/bottom04.gif
-share/pysol/cardset-ivory-mahjongg-small/bottom05.gif
-share/pysol/cardset-ivory-mahjongg-small/bottom06.gif
-share/pysol/cardset-ivory-mahjongg-small/bottom07.gif
-share/pysol/cardset-ivory-mahjongg-small/config.txt
-share/pysol/cardset-ivory-mahjongg-small/l01.gif
-share/pysol/cardset-ivory-mahjongg-small/l02.gif
-share/pysol/cardset-ivory-mahjongg-small/l03.gif
-share/pysol/cardset-ivory-mahjongg-small/l04.gif
-share/pysol/cardset-ivory-mahjongg-small/shade.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow00.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow01.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow02.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow03.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow04.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow05.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow06.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow07.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow08.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow09.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow10.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow11.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow12.gif
-share/pysol/cardset-ivory-mahjongg-small/shadow13.gif
 share/pysol/cardset-kintengu/01c.gif
 share/pysol/cardset-kintengu/01d.gif
 share/pysol/cardset-kintengu/01h.gif
@@ -424,77 +434,6 @@ share/pysol/cardset-kintengu/shadow10.gif
 share/pysol/cardset-kintengu/shadow11.gif
 share/pysol/cardset-kintengu/shadow12.gif
 share/pysol/cardset-kintengu/shadow13.gif
-share/pysol/cardset-kmahjongg/01a.gif
-share/pysol/cardset-kmahjongg/01b.gif
-share/pysol/cardset-kmahjongg/01c.gif
-share/pysol/cardset-kmahjongg/01z.gif
-share/pysol/cardset-kmahjongg/02a.gif
-share/pysol/cardset-kmahjongg/02b.gif
-share/pysol/cardset-kmahjongg/02c.gif
-share/pysol/cardset-kmahjongg/02z.gif
-share/pysol/cardset-kmahjongg/03a.gif
-share/pysol/cardset-kmahjongg/03b.gif
-share/pysol/cardset-kmahjongg/03c.gif
-share/pysol/cardset-kmahjongg/03z.gif
-share/pysol/cardset-kmahjongg/04a.gif
-share/pysol/cardset-kmahjongg/04b.gif
-share/pysol/cardset-kmahjongg/04c.gif
-share/pysol/cardset-kmahjongg/04z.gif
-share/pysol/cardset-kmahjongg/05a.gif
-share/pysol/cardset-kmahjongg/05b.gif
-share/pysol/cardset-kmahjongg/05c.gif
-share/pysol/cardset-kmahjongg/05z.gif
-share/pysol/cardset-kmahjongg/06a.gif
-share/pysol/cardset-kmahjongg/06b.gif
-share/pysol/cardset-kmahjongg/06c.gif
-share/pysol/cardset-kmahjongg/06z.gif
-share/pysol/cardset-kmahjongg/07a.gif
-share/pysol/cardset-kmahjongg/07b.gif
-share/pysol/cardset-kmahjongg/07c.gif
-share/pysol/cardset-kmahjongg/07z.gif
-share/pysol/cardset-kmahjongg/08a.gif
-share/pysol/cardset-kmahjongg/08b.gif
-share/pysol/cardset-kmahjongg/08c.gif
-share/pysol/cardset-kmahjongg/08z.gif
-share/pysol/cardset-kmahjongg/09a.gif
-share/pysol/cardset-kmahjongg/09b.gif
-share/pysol/cardset-kmahjongg/09c.gif
-share/pysol/cardset-kmahjongg/09z.gif
-share/pysol/cardset-kmahjongg/10a.gif
-share/pysol/cardset-kmahjongg/10b.gif
-share/pysol/cardset-kmahjongg/10c.gif
-share/pysol/cardset-kmahjongg/10z.gif
-share/pysol/cardset-kmahjongg/11z.gif
-share/pysol/cardset-kmahjongg/12z.gif
-share/pysol/cardset-kmahjongg/COPYRIGHT
-share/pysol/cardset-kmahjongg/back01.gif
-share/pysol/cardset-kmahjongg/bottom01.gif
-share/pysol/cardset-kmahjongg/bottom02.gif
-share/pysol/cardset-kmahjongg/bottom03.gif
-share/pysol/cardset-kmahjongg/bottom04.gif
-share/pysol/cardset-kmahjongg/bottom05.gif
-share/pysol/cardset-kmahjongg/bottom06.gif
-share/pysol/cardset-kmahjongg/bottom07.gif
-share/pysol/cardset-kmahjongg/config.txt
-share/pysol/cardset-kmahjongg/l01.gif
-share/pysol/cardset-kmahjongg/l02.gif
-share/pysol/cardset-kmahjongg/l03.gif
-share/pysol/cardset-kmahjongg/l04.gif
-share/pysol/cardset-kmahjongg/shade.gif
-share/pysol/cardset-kmahjongg/shadow00.gif
-share/pysol/cardset-kmahjongg/shadow01.gif
-share/pysol/cardset-kmahjongg/shadow02.gif
-share/pysol/cardset-kmahjongg/shadow03.gif
-share/pysol/cardset-kmahjongg/shadow04.gif
-share/pysol/cardset-kmahjongg/shadow05.gif
-share/pysol/cardset-kmahjongg/shadow06.gif
-share/pysol/cardset-kmahjongg/shadow07.gif
-share/pysol/cardset-kmahjongg/shadow08.gif
-share/pysol/cardset-kmahjongg/shadow09.gif
-share/pysol/cardset-kmahjongg/shadow10.gif
-share/pysol/cardset-kmahjongg/shadow11.gif
-share/pysol/cardset-kmahjongg/shadow12.gif
-share/pysol/cardset-kmahjongg/shadow13.gif
 share/pysol/cardset-standard/01c.gif
 share/pysol/cardset-standard/01d.gif
 share/pysol/cardset-standard/01h.gif
@@ -552,10 +491,6 @@ share/pysol/cardset-standard/back041.gif
 share/pysol/cardset-standard/back101.gif
 share/pysol/cardset-standard/back102.gif
 share/pysol/cardset-standard/back111.gif
-share/pysol/cardset-standard/back121.gif
-share/pysol/cardset-standard/back122.gif
-share/pysol/cardset-standard/back131.gif
-share/pysol/cardset-standard/back132.gif
 share/pysol/cardset-standard/back191.gif
 share/pysol/cardset-standard/back192.gif
 share/pysol/cardset-standard/bottom01.gif
@@ -775,14 +710,19 @@ share/pysol/cardset-vienna-2k/shadow11.gif
 share/pysol/cardset-vienna-2k/shadow12.gif
 share/pysol/cardset-vienna-2k/shadow13.gif
 share/pysol/html/credits.html
+share/pysol/html/ganjifa.html
 share/pysol/html/general_rules.html
 share/pysol/html/glossary.html
-share/pysol/html/gpl.html
 share/pysol/html/hanafuda.html
 share/pysol/html/howtoplay.html
+share/pysol/html/images/pysollogo01.gif
+share/pysol/html/images/pysollogo01.png
+share/pysol/html/images/pysollogo02.gif
+share/pysol/html/images/pysollogo02.png
 share/pysol/html/index.html
 share/pysol/html/install.html
 share/pysol/html/intro.html
+share/pysol/html/license.html
 share/pysol/html/news.html
 share/pysol/html/rules.html
 share/pysol/html/rules/8x8.html
@@ -790,6 +730,8 @@ share/pysol/html/rules/acesup.html
 share/pysol/html/rules/achtmalacht.html
 share/pysol/html/rules/alaska.html
 share/pysol/html/rules/americantoad.html
+share/pysol/html/rules/ashrafi.html
+share/pysol/html/rules/ashwapati.html
 share/pysol/html/rules/auldlangsyne.html
 share/pysol/html/rules/babyspiderette.html
 share/pysol/html/rules/bakersdozen.html
@@ -797,7 +739,9 @@ share/pysol/html/rules/bakersgame.html
 share/pysol/html/rules/batsford.html
 share/pysol/html/rules/beleagueredcastle.html
 share/pysol/html/rules/betsyross.html
+share/pysol/html/rules/bigeasy.html
 share/pysol/html/rules/bigharp.html
+share/pysol/html/rules/bigsumo.html
 share/pysol/html/rules/bitsnbytes.html
 share/pysol/html/rules/blackhole.html
 share/pysol/html/rules/blackwidow.html
@@ -806,14 +750,16 @@ share/pysol/html/rules/blondesandbrunettes.html
 share/pysol/html/rules/bluemoon.html
 share/pysol/html/rules/braid.html
 share/pysol/html/rules/bristol.html
+share/pysol/html/rules/brunswick.html
 share/pysol/html/rules/busyaces.html
 share/pysol/html/rules/calculation.html
 share/pysol/html/rules/canfield.html
-share/pysol/html/rules/carlton.html
 share/pysol/html/rules/carpet.html
 share/pysol/html/rules/casinoklondike.html
 share/pysol/html/rules/castlesinspain.html
+share/pysol/html/rules/cavalier.html
 share/pysol/html/rules/chameleon.html
+share/pysol/html/rules/cherrybomb.html
 share/pysol/html/rules/chessboard.html
 share/pysol/html/rules/citadel.html
 share/pysol/html/rules/concentration.html
@@ -827,6 +773,7 @@ share/pysol/html/rules/derkatzenschwanz.html
 share/pysol/html/rules/derkleinenapoleon.html
 share/pysol/html/rules/derletztemonarch.html
 share/pysol/html/rules/deuces.html
+share/pysol/html/rules/dhanpati.html
 share/pysol/html/rules/dieboesesieben.html
 share/pysol/html/rules/diekoenigsbergerin.html
 share/pysol/html/rules/dierussische.html
@@ -837,16 +784,23 @@ share/pysol/html/rules/doublegrasshopper.html
 share/pysol/html/rules/doubleklondike.html
 share/pysol/html/rules/doubleklondikebythrees.html
 share/pysol/html/rules/doublerail.html
+share/pysol/html/rules/doublesamuri.html
 share/pysol/html/rules/doublets.html
+share/pysol/html/rules/doubleyourfun.html
 share/pysol/html/rules/eaglewing.html
-share/pysol/html/rules/easthaven.html
+share/pysol/html/rules/eastcliff.html
+share/pysol/html/rules/easysupreme.html
+share/pysol/html/rules/easyxone.html
 share/pysol/html/rules/eiffeltower.html
+share/pysol/html/rules/eightlegions.html
 share/pysol/html/rules/eightoff.html
 share/pysol/html/rules/elevator.html
 share/pysol/html/rules/excuse.html
 share/pysol/html/rules/fallingstar.html
 share/pysol/html/rules/fan.html
 share/pysol/html/rules/fifteenplus.html
+share/pysol/html/rules/firecracker.html
+share/pysol/html/rules/fiveaces.html
 share/pysol/html/rules/flowerclock.html
 share/pysol/html/rules/forecell.html
 share/pysol/html/rules/fortress.html
@@ -856,9 +810,12 @@ share/pysol/html/rules/fourteen.html
 share/pysol/html/rules/fourwinds.html
 share/pysol/html/rules/freecell.html
 share/pysol/html/rules/freenapoleon.html
+share/pysol/html/rules/gajapati.html
 share/pysol/html/rules/gaji.html
 share/pysol/html/rules/gargantua.html
+share/pysol/html/rules/garhpati.html
 share/pysol/html/rules/generalspatience.html
+share/pysol/html/rules/ghulam.html
 share/pysol/html/rules/giant.html
 share/pysol/html/rules/golf.html
 share/pysol/html/rules/goodmeasure.html
@@ -874,43 +831,56 @@ share/pysol/html/rules/imperialtrumps.html
 share/pysol/html/rules/indian.html
 share/pysol/html/rules/interregnum.html
 share/pysol/html/rules/irmgard.html
+share/pysol/html/rules/justforfun.html
 share/pysol/html/rules/kingdom.html
 share/pysol/html/rules/kingonlybakersgame.html
 share/pysol/html/rules/klondike.html
 share/pysol/html/rules/klondikebythrees.html
+share/pysol/html/rules/kurma.html
 share/pysol/html/rules/labellelucie.html
 share/pysol/html/rules/ladybetty.html
 share/pysol/html/rules/ladypalk.html
 share/pysol/html/rules/larasgame.html
+share/pysol/html/rules/lexingtonharp.html
+share/pysol/html/rules/littleeasy.html
 share/pysol/html/rules/littleforty.html
 share/pysol/html/rules/longbraid.html
 share/pysol/html/rules/lucas.html
-share/pysol/html/rules/mahjongg.html
 share/pysol/html/rules/maria.html
 share/pysol/html/rules/martha.html
 share/pysol/html/rules/matriarchy.html
 share/pysol/html/rules/matsukiri.html
+share/pysol/html/rules/matsya.html
 share/pysol/html/rules/maze.html
-share/pysol/html/rules/memory6x4.html
-share/pysol/html/rules/memory8x5.html
+share/pysol/html/rules/memory24.html
+share/pysol/html/rules/memory40.html
 share/pysol/html/rules/midshipman.html
 share/pysol/html/rules/milligancell.html
-share/pysol/html/rules/milliganharp.html
 share/pysol/html/rules/missmilligan.html
 share/pysol/html/rules/montana.html
 share/pysol/html/rules/montecarlo.html
+share/pysol/html/rules/mughalcircles.html
 share/pysol/html/rules/napoleon.html
+share/pysol/html/rules/narasimha.html
+share/pysol/html/rules/narpati.html
+share/pysol/html/rules/nasty.html
 share/pysol/html/rules/neighbour.html
+share/pysol/html/rules/nomad.html
 share/pysol/html/rules/numberten.html
 share/pysol/html/rules/numerica.html
 share/pysol/html/rules/oddandeven.html
 share/pysol/html/rules/odessa.html
 share/pysol/html/rules/oonsoo.html
+share/pysol/html/rules/oonsooopen.html
+share/pysol/html/rules/oonsoostrict.html
+share/pysol/html/rules/oonsootoo.html
 share/pysol/html/rules/osmosis.html
 share/pysol/html/rules/pagat.html
 share/pysol/html/rules/pagoda.html
+share/pysol/html/rules/parashurama.html
 share/pysol/html/rules/pasdedeux.html
 share/pysol/html/rules/passeul.html
+share/pysol/html/rules/paulownia.html
 share/pysol/html/rules/peek.html
 share/pysol/html/rules/pegged.html
 share/pysol/html/rules/penguin.html
@@ -927,6 +897,7 @@ share/pysol/html/rules/rainfall.html
 share/pysol/html/rules/rankandfile.html
 share/pysol/html/rules/redandblack.html
 share/pysol/html/rules/redmoon.html
+share/pysol/html/rules/relax.html
 share/pysol/html/rules/relaxedfreecell.html
 share/pysol/html/rules/relaxedgolf.html
 share/pysol/html/rules/relaxedpyramid.html
@@ -936,10 +907,12 @@ share/pysol/html/rules/royalcotillion.html
 share/pysol/html/rules/royaleast.html
 share/pysol/html/rules/russiansolitaire.html
 share/pysol/html/rules/samuri.html
+share/pysol/html/rules/sanibel.html
 share/pysol/html/rules/scorpion.html
 share/pysol/html/rules/scotchpatience.html
 share/pysol/html/rules/seahaventowers.html
 share/pysol/html/rules/shamrocks.html
+share/pysol/html/rules/shamsher.html
 share/pysol/html/rules/siebenbisas.html
 share/pysol/html/rules/simplecarlo.html
 share/pysol/html/rules/simplepairs.html
@@ -957,16 +930,20 @@ share/pysol/html/rules/storehouse.html
 share/pysol/html/rules/strategy.html
 share/pysol/html/rules/streets.html
 share/pysol/html/rules/streetsandalleys.html
+share/pysol/html/rules/sumo.html
 share/pysol/html/rules/superflowergarden.html
 share/pysol/html/rules/superiorcanfield.html
+share/pysol/html/rules/supersamuri.html
 share/pysol/html/rules/tamoshanter.html
 share/pysol/html/rules/terrace.html
 share/pysol/html/rules/threeshufflesandadraw.html
 share/pysol/html/rules/thumbandpouch.html
-share/pysol/html/rules/towerofhanoi.html
+share/pysol/html/rules/tipati.html
+share/pysol/html/rules/towerofhanoy.html
 share/pysol/html/rules/trefoil.html
-share/pysol/html/rules/tripleline.html
 share/pysol/html/rules/unionsquare.html
+share/pysol/html/rules/vamana.html
+share/pysol/html/rules/varaha.html
 share/pysol/html/rules/variegatedcanfield.html
 share/pysol/html/rules/vegasklondike.html
 share/pysol/html/rules/waningmoon.html
@@ -974,28 +951,28 @@ share/pysol/html/rules/wasp.html
 share/pysol/html/rules/westcliff.html
 share/pysol/html/rules/wheeloffortune.html
 share/pysol/html/rules/whitehead.html
+share/pysol/html/rules/wicked.html
 share/pysol/html/rules/willothewisp.html
 share/pysol/html/rules/windmill.html
 share/pysol/html/rules/yukon.html
 share/pysol/html/rules/zebra.html
-share/pysol/html/rules_english.html
-share/pysol/html/rules_french.html
-share/pysol/html/rules_german.html
-share/pysol/html/todo.html
+share/pysol/html/rules_alternate.html
 share/pysol/images/demo/demo01.gif
 share/pysol/images/demo/demo02.gif
 share/pysol/images/demo/demo03.gif
 share/pysol/images/demo/demo04.gif
 share/pysol/images/demo/demo05.gif
-share/pysol/images/jokers/joker07_40_774.gif
-share/pysol/images/jokers/joker07_50_774.gif
-share/pysol/images/jokers/joker08_40_774.gif
-share/pysol/images/jokers/joker08_50_774.gif
-share/pysol/images/jokers/joker10_100.gif
-share/pysol/images/jokers/joker11_100_774.gif
+share/pysol/images/logos/joker07_40_774.gif
+share/pysol/images/logos/joker07_50_774.gif
+share/pysol/images/logos/joker08_40_774.gif
+share/pysol/images/logos/joker08_50_774.gif
+share/pysol/images/logos/joker10_100.gif
+share/pysol/images/logos/joker11_100_774.gif
+share/pysol/images/logos/pysol_40.gif
 share/pysol/images/noredeal.gif
 share/pysol/images/redeal.gif
 share/pysol/images/selectgame.gif
+share/pysol/images/stats/barchart.gif
 share/pysol/images/stoplight.gif
 share/pysol/images/stopsign.gif
 share/pysol/images/tree/folder.gif
@@ -1030,7 +1007,6 @@ share/pysol/sound/redo.wav
 share/pysol/sound/startdrag.wav
 share/pysol/sound/turnwaste.wav
 share/pysol/sound/undo.wav
-share/pysol/tiles/Atari_Classic.gif
 share/pysol/tiles/Baize.gif
 share/pysol/tiles/Chequered_Field.gif
 share/pysol/tiles/Fade_Blue-ffffff.ppm
@@ -1042,7 +1018,6 @@ share/pysol/tiles/Olive_Fossils.gif
 share/pysol/tiles/Orange_Ornaments.gif
 share/pysol/tiles/Pale_Satin.gif
 share/pysol/tiles/Rainbow.ppm
-share/pysol/tiles/Suits.gif
 share/pysol/toolbar/empty-large/autodrop.gif
 share/pysol/toolbar/empty-large/new.gif
 share/pysol/toolbar/empty-large/open.gif
@@ -1063,7 +1038,18 @@ share/pysol/toolbar/large/rules.gif
 share/pysol/toolbar/large/save.gif
 share/pysol/toolbar/large/stats.gif
 share/pysol/toolbar/large/undo.gif
-@exec mkdir %D/share/pysol/plugins
+share/pysol/toolbar/small/autodrop.gif
+share/pysol/toolbar/small/new.gif
+share/pysol/toolbar/small/open.gif
+share/pysol/toolbar/small/quit.gif
+share/pysol/toolbar/small/redo.gif
+share/pysol/toolbar/small/restart.gif
+share/pysol/toolbar/small/rules.gif
+share/pysol/toolbar/small/save.gif
+share/pysol/toolbar/small/stats.gif
+share/pysol/toolbar/small/undo.gif
+@exec mkdir -p %D/share/pysol/plugins
+@dirrm share/pysol/toolbar/small
 @dirrm share/pysol/toolbar/large
 @dirrm share/pysol/toolbar/empty-large
 @dirrm share/pysol/toolbar
@@ -1073,19 +1059,19 @@ share/pysol/toolbar/large/undo.gif
 @dirrm share/pysol/plugins
 @dirrm share/pysol/music
 @dirrm share/pysol/images/tree
-@dirrm share/pysol/images/jokers
+@dirrm share/pysol/images/stats
+@dirrm share/pysol/images/logos
 @dirrm share/pysol/images/demo
 @dirrm share/pysol/images
 @dirrm share/pysol/html/rules
+@dirrm share/pysol/html/images
 @dirrm share/pysol/html
 @dirrm share/pysol/cardset-vienna-2k
 @dirrm share/pysol/cardset-tuxedo
 @dirrm share/pysol/cardset-standard
-@dirrm share/pysol/cardset-kmahjongg
 @dirrm share/pysol/cardset-kintengu
-@dirrm share/pysol/cardset-ivory-mahjongg-small
 @dirrm share/pysol/cardset-hexadeck
 @dirrm share/pysol/cardset-hard-a-port
+@dirrm share/pysol/cardset-colossus
 @dirrm share/pysol/cardset-2000
 @dirrm share/pysol
-