xpat2-paths.patch

   1 diff -Nur xpat2-1.07.orig/lib/french/XPat xpat2-1.07/lib/french/XPat
   2 --- xpat2-1.07.orig/lib/french/XPat     Tue Feb 14 08:31:48 1995
   3 +++ xpat2-1.07/lib/french/XPat  Thu Oct  4 19:30:45 2001
   4 @@ -1,4 +1,4 @@
   5 -#include "../../app-defaults/XPat"
   6 +#include "../XPat"
   7  XPat*Dialog*Translations: #override \n\
   8  <Key>o: Ok()\n\
   9  <Key>n: Cancel()\n
  10 diff -Nur xpat2-1.07.orig/lib/german/XPat xpat2-1.07/lib/german/XPat
  11 --- xpat2-1.07.orig/lib/german/XPat     Mon Feb 13 18:57:06 1995
  12 +++ xpat2-1.07/lib/german/XPat  Thu Oct  4 19:30:36 2001
  13 @@ -1,4 +1,4 @@
  14 -#include "../../app-defaults/XPat"
  15 +#include "../XPat"
  16  XPat*Dialog*Translations: #override \n\
  17  <Key>j: Ok()\n\
  18  <Key>n: Cancel()\n
  19 diff -Nur xpat2-1.07.orig/lib/italian/XPat xpat2-1.07/lib/italian/XPat
  20 --- xpat2-1.07.orig/lib/italian/XPat    Thu Jun 23 18:39:18 1994
  21 +++ xpat2-1.07/lib/italian/XPat Thu Oct  4 19:30:52 2001
  22 @@ -1,4 +1,4 @@
  23 -#include "../../app-defaults/XPat"
  24 +#include "../XPat"
  25  XPat*Dialog*Translations: #override \n\
  26  <Key>s: Ok()\n\
  27  <Key>n: Cancel()\n
  28 diff -Nur xpat2-1.07.orig/src/Imakefile xpat2-1.07/src/Imakefile
  29 --- xpat2-1.07.orig/src/Imakefile       Sun Nov  5 20:05:10 2000
  30 +++ xpat2-1.07/src/Imakefile    Thu Oct  4 19:26:14 2001
  31 @@ -192,7 +192,7 @@
  32
  33
  34  MYPROG         = xpat2
  35 -LANGUAGES      = italian german russian french de_DE fr_FR it_IT
  36 +LANGUAGES      = de fr it ru
  37  DEFINES                = $(LOAD_OPTION) $(HELP_OPTION) $(KIT_OPTION) $(ROUND_OPTION) \
  38                   $(SOUND_OPTION) $(XPM_OPTION) $(GFX_OPTION) \
  39                   -DSCOREFILE=\"$(SCOREFILE)\" -DLIBDIR=\"$(XPATLIBDIR)\"
  40 @@ -208,13 +208,12 @@
  41         mkdirhier $(XPATLIBDIR)
  42         chmod 755 $(XPATLIBDIR)
  43         for f in $(LANGUAGES); do \
  44 -         mkdirhier $(APPDEFSDIR)/$$f/app-defaults; \
  45 -         cp ../lib/$$f/XPat $(APPDEFSDIR)/$$f/app-defaults; \
  46 -         chmod 755 $(APPDEFSDIR)/$$f/app-defaults; \
  47 -         chmod 644 $(APPDEFSDIR)/$$f/app-defaults/XPat; \
  48 +         mkdirhier $(APPDEFSDIR)/app-defaults/$$f; \
  49 +         cp ../lib/$$f/XPat $(APPDEFSDIR)/app-defaults/$$f; \
  50 +         chmod 755 $(APPDEFSDIR)/app-defaults/$$f; \
  51 +         chmod 644 $(APPDEFSDIR)/app-defaults/$$f/XPat; \
  52         done
  53         (cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -))
  54 -       chown -R root $(XPATLIBDIR)
  55         chmod -R a+r $(XPATLIBDIR)
  56         for f in $(LANGUAGES); do \
  57             chmod 755 $(XPATLIBDIR)/$$f; \
  58 diff -Nur xpat2-1.07.orig/src/Xpat.tmpl xpat2-1.07/src/Xpat.tmpl
  59 --- xpat2-1.07.orig/src/Xpat.tmpl       Sun Nov  5 21:03:10 2000
  60 +++ xpat2-1.07/src/Xpat.tmpl    Thu Oct  4 19:06:05 2001
  61 @@ -161,13 +161,13 @@
  62  XCOMM #########################################################################
  63
  64  XCOMM Root directory of xpat2 installation
  65 -XPATROOT       = /usr/games/lib/xpat
  66 +XPATROOT       = /usr/share/xpat
  67  XCOMM XPATROOT = /usr/local/lib/xpat
  68  XCOMM XPATROOT = /opt/XPat2
  69
  70 -XPATLIBDIR     = $(XPATROOT)
  71 -APPDEFSDIR     = $(LIBDIR)
  72 -XPATMANDIR     = $(XPATROOT)/man/man6
  73 +XPATLIBDIR     = $(DESTDIR)$(XPATROOT)
  74 +APPDEFSDIR     = $(DESTDIR)/usr/X11R6/lib/X11
  75 +XPATMANDIR     = $(DESTDIR)/usr/share/man/man6
  76
  77  XCOMM This is the name of the log-file, where solved games are stored:
  78  SCOREFILE      = /var/games/xpat.log
  79 @@ -180,8 +180,8 @@
  80
  81  XCOMM Paths for the Qt interface
  82  XCOMM QTDIR    = /usr/lib/qt1
  83 -QTDIR          = /usr/local/qt
  84 -QTINCDIR       = $(QTDIR)/include
  85 +QTDIR          = /usr
  86 +QTINCDIR       = $(QTDIR)/include/qt
  87  QTLIBDIR       = $(QTDIR)/lib
  88  MOC            = $(QTDIR)/bin/moc
  89
  90 diff -Nur xpat2-1.07.orig/src/messages.c xpat2-1.07/src/messages.c
  91 --- xpat2-1.07.orig/src/messages.c      Wed May  5 22:04:48 1999
  92 +++ xpat2-1.07/src/messages.c   Thu Oct  4 19:27:45 2001
  93 @@ -214,15 +214,15 @@
  94      iso_code[2] = '\0';
  95      /* map the existing translations (iso3166) to well-known pathnames */
  96      if (!strcmp(iso_code, "DE"))
  97 -       return langdir = "german";
  98 +       return langdir = "de";
  99      if (!strcmp(iso_code, "IT"))
 100 -       return langdir = "italian";
 101 +       return langdir = "it";
 102      if (!strcmp(iso_code, "FR"))
 103 -       return langdir = "french";
 104 +       return langdir = "fr";
 105      if (!strcmp(iso_code, ""))
 106 -       return langdir = "german";
 107 +       return langdir = "de";
 108      if (!strcmp(iso_code, "RU") || !strcmp(iso_code, "BY"))
 109 -       return langdir = "russian";
 110 +       return langdir = "ru";
 111  #ifdef _POSIX_SOURCE
 112      /* directory wasn't readable, reset it */
 113      return langdir = "";