3 files changed, 117 insertions, 112 deletions

diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index 891e65ceb12f..e1d434b4d415 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	tksol
-PORTVERSION=	1.4
-CATEGORIES=	games tk82
-MASTER_SITES=	http://www.ibiblio.org/pub/Linux/games/solitaires/ \
-		http://www.gtlib.cc.gatech.edu/pub/linux/games/solitaires/ \
-		http://ftp.fi.muni.cz/pub/linux/metalab.unc.edu/games/solitaires/ \
-		ftp://metalab.unc.edu/pub/linux/games/solitaires/
+PORTVERSION=	1.7
+CATEGORIES=	games tk84
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	games/solitaires
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -20,28 +18,25 @@ COMMENT=	A version of the card game solitaire
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_REINPLACE=	yes
-NO_BUILD=	yes
-MAN6=		tksol.6
-MANCOMPRESSED=	yes
 
-TKSOLDIR=	${PREFIX}/share/games/tksol
+NO_BUILD=	yes
+USE_REINPLACE=	yes
 
-post-extract:
-	@${RM} -rf ${WRKSRC}/downbitmaps/.xvpics
+MAN6=		tksol.6
 
 post-patch:
-	@${REINPLACE_CMD} -e "s;/usr/bin/wish;${PREFIX}/bin/wish8.4;" \
-		-e "s;/usr/local/lib/tksol;${TKSOLDIR};g" \
-		 ${WRKSRC}/tksol
+	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${PREFIX}/bin/wish8.4|g ; \
+		 s|/usr/local/lib/tksol|${DATADIR}|g' ${WRKSRC}/tksol
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tksol ${PREFIX}/bin
-	${MKDIR} ${TKSOLDIR}
-.for dir in cardbitmaps downbitmaps pictures
-	cd ${WRKSRC}; tar -cpf - ${dir} | \
-		(cd ${TKSOLDIR}; tar -xpf -)
+	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MANPREFIX}/man/man6
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.xbm ${DATADIR}
+.for dir in cardbacks cards pictures
+	${TAR} -C ${WRKSRC} --exclude ".xvpics" -cf - ${dir} | \
+		${TAR} -C ${DATADIR} --unlink -xf -
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/${MAN6}.gz ${PREFIX}/man/man6
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/tksol/distinfo b/games/tksol/distinfo
index b54d7f846efc..452c0e6bd0a2 100644
--- a/games/tksol/distinfo
+++ b/games/tksol/distinfo
@@ -1 +1 @@
-MD5 (tksol-1.4.tgz) = cc79298159e9fe0dd182048ca11c7795
+MD5 (tksol-1.7.tgz) = b3062250213a023ff3f5a8b5c12d8617
diff --git a/games/tksol/pkg-plist b/games/tksol/pkg-plist
index 87938c313e2a..ab4c8aa76681 100644
--- a/games/tksol/pkg-plist
+++ b/games/tksol/pkg-plist
@@ -1,91 +1,101 @@
 bin/tksol
-share/games/tksol/cardbitmaps/c1
-share/games/tksol/cardbitmaps/c10
-share/games/tksol/cardbitmaps/c11
-share/games/tksol/cardbitmaps/c12
-share/games/tksol/cardbitmaps/c13
-share/games/tksol/cardbitmaps/c2
-share/games/tksol/cardbitmaps/c3
-share/games/tksol/cardbitmaps/c4
-share/games/tksol/cardbitmaps/c5
-share/games/tksol/cardbitmaps/c6
-share/games/tksol/cardbitmaps/c7
-share/games/tksol/cardbitmaps/c8
-share/games/tksol/cardbitmaps/c9
-share/games/tksol/cardbitmaps/cardbitmaps.c
-share/games/tksol/cardbitmaps/copyright.h
-share/games/tksol/cardbitmaps/d1
-share/games/tksol/cardbitmaps/d10
-share/games/tksol/cardbitmaps/d11
-share/games/tksol/cardbitmaps/d12
-share/games/tksol/cardbitmaps/d13
-share/games/tksol/cardbitmaps/d2
-share/games/tksol/cardbitmaps/d3
-share/games/tksol/cardbitmaps/d4
-share/games/tksol/cardbitmaps/d5
-share/games/tksol/cardbitmaps/d6
-share/games/tksol/cardbitmaps/d7
-share/games/tksol/cardbitmaps/d8
-share/games/tksol/cardbitmaps/d9
-share/games/tksol/cardbitmaps/h1
-share/games/tksol/cardbitmaps/h10
-share/games/tksol/cardbitmaps/h11
-share/games/tksol/cardbitmaps/h12
-share/games/tksol/cardbitmaps/h13
-share/games/tksol/cardbitmaps/h2
-share/games/tksol/cardbitmaps/h3
-share/games/tksol/cardbitmaps/h4
-share/games/tksol/cardbitmaps/h5
-share/games/tksol/cardbitmaps/h6
-share/games/tksol/cardbitmaps/h7
-share/games/tksol/cardbitmaps/h8
-share/games/tksol/cardbitmaps/h9
-share/games/tksol/cardbitmaps/s1
-share/games/tksol/cardbitmaps/s10
-share/games/tksol/cardbitmaps/s11
-share/games/tksol/cardbitmaps/s12
-share/games/tksol/cardbitmaps/s13
-share/games/tksol/cardbitmaps/s2
-share/games/tksol/cardbitmaps/s3
-share/games/tksol/cardbitmaps/s4
-share/games/tksol/cardbitmaps/s5
-share/games/tksol/cardbitmaps/s6
-share/games/tksol/cardbitmaps/s7
-share/games/tksol/cardbitmaps/s8
-share/games/tksol/cardbitmaps/s9
-share/games/tksol/downbitmaps/bucky.xbm
-share/games/tksol/downbitmaps/circles.xbm
-share/games/tksol/downbitmaps/darts.xbm
-share/games/tksol/downbitmaps/default
-share/games/tksol/downbitmaps/gnu.xbm
-share/games/tksol/downbitmaps/leopard.xbm
-share/games/tksol/downbitmaps/lines.xbm
-share/games/tksol/downbitmaps/linux.xbm
-share/games/tksol/downbitmaps/rock.xbm
-share/games/tksol/downbitmaps/x.xbm
-share/games/tksol/downbitmaps/xx.xbm
-share/games/tksol/pictures/armidillo.xbm
-share/games/tksol/pictures/butterfly.xbm
-share/games/tksol/pictures/chess.xbm
-share/games/tksol/pictures/default
-share/games/tksol/pictures/extra/bosch7a.xbm
-share/games/tksol/pictures/extra/deer.xbm
-share/games/tksol/pictures/extra/dugong.xbm
-share/games/tksol/pictures/extra/fruit.xbm
-share/games/tksol/pictures/extra/mensetmanus.xbm
-share/games/tksol/pictures/extra/squirrel.xbm
-share/games/tksol/pictures/flower.xbm
-share/games/tksol/pictures/frog.xbm
-share/games/tksol/pictures/grapes.xbm
-share/games/tksol/pictures/grypheura.xbm
-share/games/tksol/pictures/halloween.xbm
-share/games/tksol/pictures/hwowl.xbm
-share/games/tksol/pictures/kittyt.xbm
-share/games/tksol/pictures/rooster.xbm
-share/games/tksol/pictures/snake.xbm
-@dirrm share/games/tksol/pictures/extra
-@dirrm share/games/tksol/pictures
-@dirrm share/games/tksol/downbitmaps
-@dirrm share/games/tksol/cardbitmaps
-@dirrm share/games/tksol
-@dirrm share/games
+%%DATADIR%%/cardbacks/bucky.xbm
+%%DATADIR%%/cardbacks/circles.xbm
+%%DATADIR%%/cardbacks/darts.xbm
+%%DATADIR%%/cardbacks/default
+%%DATADIR%%/cardbacks/leopard.xbm
+%%DATADIR%%/cardbacks/lines.xbm
+%%DATADIR%%/cardbacks/rock.xbm
+%%DATADIR%%/cardbacks/x.xbm
+%%DATADIR%%/cardbacks/xx.xbm
+%%DATADIR%%/cards/c1
+%%DATADIR%%/cards/c10
+%%DATADIR%%/cards/c11
+%%DATADIR%%/cards/c12
+%%DATADIR%%/cards/c13
+%%DATADIR%%/cards/c2
+%%DATADIR%%/cards/c3
+%%DATADIR%%/cards/c4
+%%DATADIR%%/cards/c5
+%%DATADIR%%/cards/c6
+%%DATADIR%%/cards/c7
+%%DATADIR%%/cards/c8
+%%DATADIR%%/cards/c9
+%%DATADIR%%/cards/cardbitmaps.c
+%%DATADIR%%/cards/copyright.h
+%%DATADIR%%/cards/d1
+%%DATADIR%%/cards/d10
+%%DATADIR%%/cards/d11
+%%DATADIR%%/cards/d12
+%%DATADIR%%/cards/d13
+%%DATADIR%%/cards/d2
+%%DATADIR%%/cards/d3
+%%DATADIR%%/cards/d4
+%%DATADIR%%/cards/d5
+%%DATADIR%%/cards/d6
+%%DATADIR%%/cards/d7
+%%DATADIR%%/cards/d8
+%%DATADIR%%/cards/d9
+%%DATADIR%%/cards/h1
+%%DATADIR%%/cards/h10
+%%DATADIR%%/cards/h11
+%%DATADIR%%/cards/h12
+%%DATADIR%%/cards/h13
+%%DATADIR%%/cards/h2
+%%DATADIR%%/cards/h3
+%%DATADIR%%/cards/h4
+%%DATADIR%%/cards/h5
+%%DATADIR%%/cards/h6
+%%DATADIR%%/cards/h7
+%%DATADIR%%/cards/h8
+%%DATADIR%%/cards/h9
+%%DATADIR%%/cards/s1
+%%DATADIR%%/cards/s10
+%%DATADIR%%/cards/s11
+%%DATADIR%%/cards/s12
+%%DATADIR%%/cards/s13
+%%DATADIR%%/cards/s2
+%%DATADIR%%/cards/s3
+%%DATADIR%%/cards/s4
+%%DATADIR%%/cards/s5
+%%DATADIR%%/cards/s6
+%%DATADIR%%/cards/s7
+%%DATADIR%%/cards/s8
+%%DATADIR%%/cards/s9
+%%DATADIR%%/mask.xbm
+%%DATADIR%%/pictures/armidillo.xbm
+%%DATADIR%%/pictures/bosch7a.xbm
+%%DATADIR%%/pictures/butterfly.xbm
+%%DATADIR%%/pictures/chess.xbm
+%%DATADIR%%/pictures/default
+%%DATADIR%%/pictures/dugong.xbm
+%%DATADIR%%/pictures/flower.xbm
+%%DATADIR%%/pictures/fruit.xbm
+%%DATADIR%%/pictures/generate_mini_pictures
+%%DATADIR%%/pictures/grapes.xbm
+%%DATADIR%%/pictures/grypheura.xbm
+%%DATADIR%%/pictures/halloween.xbm
+%%DATADIR%%/pictures/hwowl.xbm
+%%DATADIR%%/pictures/kittyt.xbm
+%%DATADIR%%/pictures/mini/armidillo.xbm
+%%DATADIR%%/pictures/mini/bosch7a.xbm
+%%DATADIR%%/pictures/mini/butterfly.xbm
+%%DATADIR%%/pictures/mini/chess.xbm
+%%DATADIR%%/pictures/mini/dugong.xbm
+%%DATADIR%%/pictures/mini/flower.xbm
+%%DATADIR%%/pictures/mini/fruit.xbm
+%%DATADIR%%/pictures/mini/grapes.xbm
+%%DATADIR%%/pictures/mini/grypheura.xbm
+%%DATADIR%%/pictures/mini/halloween.xbm
+%%DATADIR%%/pictures/mini/hwowl.xbm
+%%DATADIR%%/pictures/mini/kittyt.xbm
+%%DATADIR%%/pictures/mini/rooster.xbm
+%%DATADIR%%/pictures/mini/squirrel.xbm
+%%DATADIR%%/pictures/rooster.xbm
+%%DATADIR%%/pictures/squirrel.xbm
+%%DATADIR%%/place.xbm
+@dirrm %%DATADIR%%/pictures/mini
+@dirrm %%DATADIR%%/pictures
+@dirrm %%DATADIR%%/cards
+@dirrm %%DATADIR%%/cardbacks
+@dirrm %%DATADIR%%/