File xscrabble-2.10.patch of Package xscrabble

Overview Repositories Revisions Requests Users Attributes Meta

File xscrabble-2.10.patch of Package xscrabble (Revision 58124aa723d8c335789bd0a519dce3ff)

Currently displaying revision 58124aa723d8c335789bd0a519dce3ff , Show latest

--- XScrabble
+++ XScrabble
@@ -1,9 +1,9 @@
 ! *** XScrabble_en (English) resource file ***
 
 ! edit the following four pathnames as required:
-*dictfile:			/usr/games/lib/scrabble/en/OSPD3
-*scorefile:			/usr/games/lib/scrabble/en/scrabble_scores
-*rulesfile:			/usr/games/lib/scrabble/en/scrabble_rules
+*dictfile:			/usr/share/games/scrabble/en/OSPD3
+*scorefile:			/var/games/scrabble_scores-en
+*rulesfile:			/usr/share/games/scrabble/en/scrabble_rules
 
 ! version string, to make sure correct resource file is loaded
 *version:			210
@@ -165,7 +165,7 @@
 *abouttitle.label:		XScrabble
 *abouttitle.font:		-*-charter-bold-r-*-*-30-*-*-*-*-*-iso8859-*
 *abouttext.label:		By:\nMatt Chapman &\nMatthew Badham
-*abouttext.font:		-*-times-bold-r-*-*-16-*-*-*-*-*-iso8859-*
+*abouttext.font:		-*-times-bold-r-*-*-14-*-*-*-*-*-iso8859-*
 *aboutdismiss.label:		Dismiss
 
 *scoretitle.fromVert:		title
--- build
+++ build
@@ -1,9 +1,10 @@
 #!/bin/sh
 
 # Install defaults
-APPDEFAULTS=/usr/lib/X11/app-defaults
-BINDIR=/usr/games/bin
-LIBDIR=/usr/games/lib/scrabble
+APPDEFAULTS=$DESTDIR/usr/X11R6/lib/X11/app-defaults
+BINDIR=$DESTDIR/usr/games/
+LIBDIR=$DESTDIR/usr/share/games/scrabble
+VARDIR=$DESTDIR/var/games
 
 # Version (don't modify without knowing!!)
 MAJOR=2
@@ -22,6 +23,7 @@
    APPDEFAULTS=$APPDEFAULTS
    BINDIR=$BINDIR
    LIBDIR=$LIBDIR
+   VARDIR=$VARDIR
 First edit these parameters as needed in the 'build' script...
 "
 fi
@@ -31,7 +33,7 @@
   echo "\
 #define VERSION $MAJOR$MINOR
 #define DICT_FILE \"$LIBDIR/en/OSPD3.gz\"
-#define SCORE_FILE \"$LIBDIR/en/scrabble_scores\"
+#define SCORE_FILE \"$VARDIR/scrabble_scores-en\"
 #define RULES_FILE \"$LIBDIR/en/scrabble_rules\"
 " > src/config.h
   xmkmf -a
@@ -58,6 +60,8 @@
   echo "install -c -s src/xscrab $BINDIR"
   install -c -s src/xscrabble $BINDIR
   echo "install -c -s src/xscrabble $BINDIR"
+  mkdirhier $APPDEFAULTS
+  echo "mkdirhier $APPDEFAULTS"
   rm -f $APPDEFAULTS/XScrabble
   cp -f XScrabble $APPDEFAULTS
   echo "cp -f XScrabble $APPDEFAULTS"
@@ -70,8 +74,8 @@
 
 if test "$1" = "lang" ; then
 
-  if ! [ -r ../xscrabble_$2.tgz ] ; then
-     echo "Can't find package xscrabble_$2.tgz !!"
+  if [ ! -d xscrabble_$2 ] && [ ! -r ../xscrabble_$2 ] ; then
+     echo "Can't find directory xscrabble_$2 or package xscrabble_$2.tgz !!"
      echo "Please download the dictionary file xscrabble_$2.tgz"
      echo "(if any), from  ftp://ftp.ac-grenoble.fr/ge/educational_games"
      echo "and make sure that you put it under the same (sub)directory"
@@ -80,7 +84,10 @@
   fi
   echo "Installing language ($en) dictionary and related files..."
   mkdirhier $LIBDIR
-  tar xvfz ../xscrabble_$2.tgz 
+  mkdirhier $VARDIR
+  if [ ! -d xscrabble_$2 ] ; then
+     tar xvfz ../xscrabble_$2.tgz 
+  fi
   echo ""
   rm -rf $LIBDIR/$2
   echo "rm -rf $LIBDIR/$2"
@@ -90,11 +97,11 @@
   echo "mv -f xscrabble_$2/app-defaults/XScrabble_$2 $APPDEFAULTS"
   rm -f $APPDEFAULTS/XScrabble
   echo "rm -f $APPDEFAULTS/XScrabble"
-  ln -fs $APPDEFAULTS/XScrabble_$2 $APPDEFAULTS/XScrabble
+  ln -fs XScrabble_$2 $APPDEFAULTS/XScrabble
   echo "ln -fs $APPDEFAULTS/XScrabble_$2 $APPDEFAULTS/XScrabble"
-  chmod a+rwx $LIBDIR/$2 
-  chmod a+rw $LIBDIR/$2/scrabble_scores
-  rm -rf xscrabble_$2
+  chmod 755 $LIBDIR/$2
+  chmod 664 $LIBDIR/$2/scrabble_scores
+  mv $LIBDIR/$2/scrabble_scores $VARDIR/scrabble_scores-$2
 
   echo "
 Type './build lang YY' to install any other dictionaries in 
--- src/xscrab.h
+++ src/xscrab.h
@@ -47,7 +47,7 @@
 #define SETBG(x) XtVaTypedArg,XtNbackground,XtRString,x,strlen((char *)x)+1
 #define SETFG(x) XtVaTypedArg,XtNforeground,XtRString,x,strlen((char *)x)+1
 #define TILECOL "lightgoldenrodyellow"
-#define BRIGHTCOL "white"
+#define BRIGHTCOL "brown"
 #define BARCOL "forestgreen"
 #define LONGBAR 13
 
--- xscrabble_en/app-defaults/XScrabble_en
+++ xscrabble_en/app-defaults/XScrabble_en
@@ -1,9 +1,9 @@
 ! *** XScrabble_en (English) resource file ***
 
 ! edit the following four pathnames as required:
-*dictfile:			/usr/games/lib/scrabble/en/OSPD3
-*scorefile:			/usr/games/lib/scrabble/en/scrabble_scores
-*rulesfile:			/usr/games/lib/scrabble/en/scrabble_rules
+*dictfile:			/usr/share/games/scrabble/en/OSPD3
+*scorefile:			/var/games/scrabble_scores-en
+*rulesfile:			/usr/share/games/scrabble/en/scrabble_rules
 
 ! version string, to make sure correct resource file is loaded
 *version:			210
@@ -165,7 +165,7 @@
 *abouttitle.label:		XScrabble
 *abouttitle.font:		-*-charter-bold-r-*-*-30-*-*-*-*-*-iso8859-*
 *abouttext.label:		By:\nMatt Chapman &\nMatthew Badham
-*abouttext.font:		-*-times-bold-r-*-*-16-*-*-*-*-*-iso8859-*
+*abouttext.font:		-*-times-bold-r-*-*-14-*-*-*-*-*-iso8859-*
 *aboutdismiss.label:		Dismiss
 
 *scoretitle.fromVert:		title
--- xscrabble_fr/app-defaults/XScrabble_fr
+++ xscrabble_fr/app-defaults/XScrabble_fr
@@ -1,9 +1,9 @@
 ! *** XScrabble_fr (French) resource file ***
 
 ! edit the following four pathnames as required:
-*dictfile:			/usr/games/lib/scrabble/fr/ODS2
-*scorefile:			/usr/games/lib/scrabble/fr/scrabble_scores
-*rulesfile:			/usr/games/lib/scrabble/fr/scrabble_regles
+*dictfile:			/usr/share/games/scrabble/fr/ODS2
+*scorefile:			/var/games/scrabble_scores-fr
+*rulesfile:			/usr/share/games/scrabble/fr/scrabble_regles
 
 ! version string, to make sure correct resource file is loaded
 *version:			210
@@ -164,7 +164,7 @@
 *abouttitle.label:		XScrabble
 *abouttitle.font:		-*-charter-bold-r-*-*-30-*-*-*-*-*-iso8859-*
 *abouttext.label:		Par:\nMatt Chapman &\nMatthew Badham
-*abouttext.font:		-*-times-bold-r-*-*-16-*-*-*-*-*-iso8859-*
+*abouttext.font:		-*-times-bold-r-*-*-14-*-*-*-*-*-iso8859-*
 *aboutdismiss.label:		Fermer
 
 *scoretitle.fromVert:		title

Places

File xscrabble-2.10.patch of Package xscrabble (Revision 58124aa723d8c335789bd0a519dce3ff)

Places