games/xscrabble: update to 2.12

	1. Update to xscrabble 2.12
	2. Fix typo in pkg-descr and trim trailing blanks

	"You might be able to improve upon this"

	This port does something I don't like: it installs an empty,
	unwritable scrabble_scores file in a directory whose contents
	shouldn't be modified. Players then need to override the
	app-defaults by placing a

	XScrabble.scorefile: /path/to/scrabble_scores

	line in $HOME/.Xdefaults (or $HOME/.Xresources, whatever).

	Wouldn't it make more sense to create a new, empty, writable
	score file under /var/games (if it doesn't exist) upon
	package installation; make the app-defaults file reference that;
	on deinstall, remove /var/games/scrabble_scores if it is empty or
	print a message indicating this file needs to be deleted manually
	in order to remove all traces?

PR:		ports/111839
Submitted by:	"Eric P. Scott" <eps+pbug0704@ana.com>

3 files changed, 24 insertions, 24 deletions

diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 98ffb9b3f883..acde1cdeb632 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	xscrabble
-PORTVERSION=	2.10
-PORTREVISION=	1
+PORTVERSION=	2.12
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/educational_games/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz ${PORTNAME}_en.tgz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X version of the popular board game
 
+USE_BZIP2=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
@@ -30,7 +30,7 @@ post-patch:
 		>> ${WRKSRC}/src/config.h
 	@${ECHO_CMD} '#define RULES_FILE "${XSCRABBLEDIR}/scrabble_rules"' \
 		>> ${WRKSRC}/src/config.h
-	@${SED} -e 's|/usr/games/lib/scrabble/en|${XSCRABBLEDIR}|g' \
+	@${SED} -e 's|/usr/share/games/scrabble/en|${XSCRABBLEDIR}|g' \
 		${WRKSRC}/../xscrabble_en/app-defaults/XScrabble_en \
 		> ${WRKSRC}/XScrabble
 	@${REINPLACE_CMD} -e 's|= -O|=$$(CDEBUGFLAGS)|g' ${WRKSRC}/Imakefile
diff --git a/games/xscrabble/distinfo b/games/xscrabble/distinfo
index 3f4c89a68540..92e9364fd209 100644
--- a/games/xscrabble/distinfo
+++ b/games/xscrabble/distinfo
@@ -1,6 +1,6 @@
-MD5 (xscrabble-2.10.tgz) = 376531c836b62f81d2ac2281495b5030
-SHA256 (xscrabble-2.10.tgz) = a496804b62ad4bd95792505c3f6dbb9fce33cc49aa38ad36c4a812f7e1e2dff1
-SIZE (xscrabble-2.10.tgz) = 83575
-MD5 (xscrabble_en.tgz) = 791244c62c92fc2dfd1c524f1a25eb9f
-SHA256 (xscrabble_en.tgz) = 8bd52efeb50419e310f7a4c436045c3028903a197294bd8af0eab32093074fb0
-SIZE (xscrabble_en.tgz) = 393527
+MD5 (xscrabble-2.12.tar.bz2) = 733e90def2c1d60c0c223f3a0c908db9
+SHA256 (xscrabble-2.12.tar.bz2) = e3eb8a93810af31ea9589f801fb529e7d83df4a54f5d836972777cb4fce81b3d
+SIZE (xscrabble-2.12.tar.bz2) = 79415
+MD5 (xscrabble_en.tar.bz2) = 2fb0ec2e84de2fb0b91ca2d6919df4d5
+SHA256 (xscrabble_en.tar.bz2) = c52c672fb5f3a3b19f6759d26bc1e3b1755bbc79361ddfa1d085842810560a4c
+SIZE (xscrabble_en.tar.bz2) = 397796
diff --git a/games/xscrabble/pkg-descr b/games/xscrabble/pkg-descr
index 6114881536dd..af0914146d66 100644
--- a/games/xscrabble/pkg-descr
+++ b/games/xscrabble/pkg-descr
@@ -1,19 +1,19 @@
-To run:                                                                         
+To run:
 
-Simpy type xscrabble. This will bring up the setup box which will allow         
-you to enter the names and displays and other info for the game to wish         
-to play. Then click on the Start Game button, (or Load Previous if you're       
-restarting a game). The main program, xscrab, will then be automatically        
-called with the appropriate options.                                            
+Simply type xscrabble. This will bring up the setup box which will allow
+you to enter the names and displays and other info for the game to wish
+to play. Then click on the Start Game button, (or Load Previous if you're
+restarting a game). The main program, xscrab, will then be automatically
+called with the appropriate options.
 
-The game is saved after every turn (in "~/.xscrabble.save" of the               
-person running it) and can be restarted by running xscrabble, entering          
-exactly the same info, and hitting the Load Previous button.                    
+The game is saved after every turn (in "~/.xscrabble.save" of the
+person running it) and can be restarted by running xscrabble, entering
+exactly the same info, and hitting the Load Previous button.
 
-This was a student project, and there are not likely to be any future           
-releases.                                                                       
- 
-Have fun,                                                                       
+This was a student project, and there are not likely to be any future
+releases.
 
-Matt Chapman.                                                                   
+Have fun,
+
+Matt Chapman.
 E-mail: matt@belgarath.demon.co.uk (no longer csuoq@csv.warwick.ac.uk)