SOURCES: vice-FHS.patch - adapted for 1.22 version

[lisu]

Author: lisu                         Date: Mon Aug 13 09:29:39 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adapted for 1.22 version

---- Files affected:
SOURCES:
   vice-FHS.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/vice-FHS.patch
diff -u SOURCES/vice-FHS.patch:1.4 SOURCES/vice-FHS.patch:1.5
--- SOURCES/vice-FHS.patch:1.4	Sun Jul 15 17:10:48 2007
+++ SOURCES/vice-FHS.patch	Mon Aug 13 11:29:34 2007
@@ -1,6 +1,6 @@
---- vice-1.21/src/arch/unix/x11/gnome/x11ui.c~	2007-03-04 22:47:42.000000000 +0100
-+++ vice-1.21/src/arch/unix/x11/gnome/x11ui.c	2007-07-06 19:51:34.000000000 +0200
-@@ -425,9 +425,9 @@
+--- vice-1.22/src/arch/unix/x11/gnome/x11ui.c~	2007-08-04 15:24:43.000000000 +0200
++++ vice-1.22/src/arch/unix/x11/gnome/x11ui.c	2007-08-13 11:04:42.000000000 +0200
+@@ -424,9 +424,9 @@
      gtk_init(&fake_argc, &fake_args);
  
      /* set X11 fontpath */
@@ -12,7 +12,7 @@
  	
  	if (system(cmd) != 0)
  	    fprintf(stderr, _("Can't add fontpath `%s'.\n"), cmd);
-@@ -1435,7 +1435,7 @@
+@@ -1404,7 +1404,7 @@
  	ui_dispatch_events();
  
  	/* remove fontpath, Don't care about result */
@@ -21,30 +21,58 @@
  
          lib_free(s);	
  	exit(0);
---- vice-1.21/src/arch/unix/archdep.h~	2005-03-28 21:10:20.000000000 +0200
-+++ vice-1.21/src/arch/unix/archdep.h	2007-07-06 19:53:16.000000000 +0200
-@@ -96,7 +96,7 @@
+--- vice-1.22/src/arch/unix/archdep.h~	2007-04-29 20:50:17.000000000 +0200
++++ vice-1.22/src/arch/unix/archdep.h	2007-08-13 11:06:44.000000000 +0200
+@@ -106,11 +106,7 @@
  extern const char *archdep_home_path(void);
  
  /* Define the default system directory (where the ROMs are).  */
+-#ifdef __NetBSD__
+ #define LIBDIR          PREFIX "/share/vice"
+-#else
 -#define LIBDIR          PREFIX "/lib/vice"
-+#define LIBDIR          PREFIX "/share/vice"
- #define DOCDIR          LIBDIR "/doc"
- #define VICEUSERDIR     ".vice"
- 
---- vice-1.21/configure.in~	2007-03-04 22:58:50.000000000 +0100
-+++ vice-1.21/configure.in	2007-07-06 20:00:05.000000000 +0200
-@@ -1891,7 +1891,7 @@
+-#endif
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+ #define DOCDIR          PREFIX "/share/doc/vice"
+--- vice-1.22/configure.in~	2007-08-05 21:52:39.000000000 +0200
++++ vice-1.22/configure.in	2007-08-13 11:09:09.000000000 +0200
+@@ -2049,20 +2049,20 @@
  		   [Where do we want to install the executable?])
  
  dnl Path for keymaps, ROMs etc.
--VICEDIR="$PREFIX/lib/vice";
-+VICEDIR="/usr/share/vice";
+-case "$host_os" in
+-  netbsd*)
+-    VICEDIR="$PREFIX/share/vice";
+-    AM_CONDITIONAL(ALTERNATE_DOCDIR, true)
+-    ;;
+-  freebsd*)
+-    VICEDIR="$PREFIX/lib/vice";
+-    AM_CONDITIONAL(ALTERNATE_DOCDIR, true)
+-    ;;
+-  *)
+-    VICEDIR="$PREFIX/lib/vice";
++#case "$host_os" in
++#  netbsd*)
++#    VICEDIR="$PREFIX/share/vice";
++#    AM_CONDITIONAL(ALTERNATE_DOCDIR, true)
++#    ;;
++#  freebsd*)
++#    VICEDIR="$PREFIX/lib/vice";
++#    AM_CONDITIONAL(ALTERNATE_DOCDIR, true)
++#    ;;
++#  *)
++    VICEDIR="/usr/share/vice";
+     AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+-    ;;  
+-esac
++#    ;;  
++#esac
  AC_SUBST(VICEDIR)
  
  if false ; then
---- vice-1.21/data/fonts/Makefile.am~	2006-01-30 22:48:17.000000000 +0100
-+++ vice-1.21/data/fonts/Makefile.am	2007-07-06 21:34:07.000000000 +0200
+--- vice-1.22/data/fonts/Makefile.am~	2006-01-30 22:48:17.000000000 +0100
++++ vice-1.22/data/fonts/Makefile.am	2007-08-13 11:10:43.000000000 +0200
 @@ -1,4 +1,4 @@
 -fontsdir = $(VICEDIR)/fonts
 +fontsdir = /usr/share/fonts/misc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/vice-FHS.patch?r1=1.4&r2=1.5&f=u