* Update to 0.71

* Sign over maintainership to gnome@

Approved by:	sobomax

3 files changed, 40 insertions, 38 deletions

diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
index fcfdb1a..dc7e76b 100644
--- a/x11/libxklavier/files/patch-configure
+++ b/x11/libxklavier/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Wed May 29 22:09:41 2002
-+++ configure	Fri May 31 13:28:42 2002
-@@ -5464,6 +5464,7 @@
+--- configure.orig	Fri Nov  1 06:34:11 2002
++++ configure	Sat Nov  9 02:15:02 2002
+@@ -7964,6 +7964,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,21 +8,3 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -5577,7 +5578,7 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <xmlversion.h>
-+#include <libxml/xmlversion.h>
- 
- int 
- main()
-@@ -5688,7 +5689,7 @@
- #line 5689 "configure"
- #include "confdefs.h"
- 
--#include <xmlversion.h>
-+#include <libxml/xmlversion.h>
- #include <stdio.h>
- 
- int main() {
diff --git a/x11/libxklavier/files/patch-doc::html::Makefile.in b/x11/libxklavier/files/patch-doc::html::Makefile.in
deleted file mode 100644
index 8f4b19e..0000000
--- a/x11/libxklavier/files/patch-doc::html::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/html/Makefile.in	2002/05/31 10:38:48	1.1
-+++ doc/html/Makefile.in	2002/05/31 10:39:18
-@@ -122,7 +122,7 @@
- 
- EXTRA_DIST = $(EXTRA_WEB_FILES) $(HTML_FILES)
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
-+docdir = $(datadir)/doc/$(PACKAGE)/html
- 
- doc_DATA = $(EXTRA_DIST)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/libxklavier/files/patch-libxlavier_xklavier_config.c b/x11/libxklavier/files/patch-libxlavier_xklavier_config.c
new file mode 100644
index 0000000..61a7f2f
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxlavier_xklavier_config.c
@@ -0,0 +1,37 @@
+--- libxklavier/xklavier_config.c.orig	Thu May 15 00:43:07 2003
++++ libxklavier/xklavier_config.c	Thu May 15 00:45:12 2003
+@@ -42,6 +42,18 @@
+ static XkbComponentNamesRec componentNames;
+ static char *locale;
+ 
++static char *
++xxx_strndup(const char *str, int len) {
++    char *ret;
++
++    if ((str == NULL || len < 0)) return(NULL);
++    ret = (char *)malloc(len + 1);
++    if (ret == NULL) return(NULL);
++    memcpy(ret, str, len);
++    ret[len] = '\0';
++    return(ret);
++}
++
+ static Bool _XklConfigInitialized(  )
+ {
+   return theRegistry.xpathContext != NULL;
+@@ -306,13 +318,13 @@
+     while( ( npc = strchr( pc, ',' ) ) != NULL )
+     {
+       int len = npc - pc;
+-      *ppc = ( char * ) strndup( pc, len );
++      *ppc = ( char * ) xxx_strndup( pc, len );
+       ppc++;
+       pc = npc + 1;
+     }
+ 
+     len = npc - pc;
+-    *ppc = ( char * ) strndup( pc, len );
++    *ppc = ( char * ) xxx_strndup( pc, len );
+   }
+ }
+