6 files changed, 44 insertions, 228 deletions

diff --git a/textproc/scrollkeeper/files/patch-Makefile.in b/textproc/scrollkeeper/files/patch-Makefile.in
index ae0c814d4b82..26e75d4376dc 100644
--- a/textproc/scrollkeeper/files/patch-Makefile.in
+++ b/textproc/scrollkeeper/files/patch-Makefile.in
@@ -1,16 +1,25 @@
---- Makefile.in.orig	Wed Apr 23 00:35:36 2003
-+++ Makefile.in	Wed Apr 23 00:36:38 2003
-@@ -145,16 +145,14 @@
+--- Makefile.in.orig	Sat Dec  6 17:36:32 2003
++++ Makefile.in	Sat Dec  6 17:37:57 2003
+@@ -193,18 +193,6 @@
+ 	scrollkeeper-spec.txt
  
- EXTRA_DIST = scrollkeeper.spec.in COPYING-DOCS TODO intltool-extract.in intltool-merge.in intltool-update.in scrollkeeper-spec.txt
  
 -scrollkeeperdocdir = $(datadir)/doc/scrollkeeper-$(VERSION)
--scrollkeeperdoc_DATA = COPYING-DOCS
--scrollkeeper_localstate_dir = $(localstatedir)/lib/scrollkeeper
-+scrollkeeper_localstate_dir = $(localstatedir)/db/scrollkeeper
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-scrollkeeperdoc_DATA = \
+-	AUTHORS			\
+-	ChangeLog		\
+-	COPYING.DOC		\
+-	COPYING			\
+-	NEWS			\
+-	README			\
+-	scrollkeeper-spec.txt	\
+-	TODO
+-
+-
+ scrollkeeper_localstate_dir = $(localstatedir)/@SCROLLKEEPER_PARTIAL_DB_DIR@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+@@ -222,7 +210,7 @@
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = intl/Makefile scrollkeeper.spec
  DIST_SOURCES =
@@ -18,8 +27,8 @@
 +DATA =
  
  
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-@@ -443,7 +441,6 @@
+ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+@@ -564,7 +552,6 @@
  all-am: Makefile $(DATA) config.h
  installdirs: installdirs-recursive
  installdirs-am:
diff --git a/textproc/scrollkeeper/files/patch-cl_src_get-cl.c b/textproc/scrollkeeper/files/patch-cl_src_get-cl.c
deleted file mode 100644
index c19108275e2c..000000000000
--- a/textproc/scrollkeeper/files/patch-cl_src_get-cl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- cl/src/get-cl.c.orig	Thu Sep 12 23:54:01 2002
-+++ cl/src/get-cl.c	Thu Sep 12 23:54:44 2002
-@@ -44,7 +44,7 @@
- 	
- 	for(i = 0; i < 5; i++) {
- 		snprintf(path, PATHLEN, "/tmp/scrollkeeper-tempfile.%d", i);
--		if (stat(path, &buf) == -1) {
-+		if (lstat(path, &buf) == -1) {
- 			if (errno == ENOENT) {
- 				/* this is an empty slot so use it */
- 				
diff --git a/textproc/scrollkeeper/files/patch-configure b/textproc/scrollkeeper/files/patch-configure
index 72eece1037bc..054d07f1fdf9 100644
--- a/textproc/scrollkeeper/files/patch-configure
+++ b/textproc/scrollkeeper/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jan 23 01:12:13 2003
-+++ configure	Wed Apr 23 00:40:24 2003
-@@ -7407,6 +7407,7 @@
+--- configure.orig	Sat Dec  6 03:18:20 2003
++++ configure	Sat Dec  6 17:46:38 2003
+@@ -7864,6 +7864,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,21 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8795,13 +8796,13 @@
-    *)
- 	echo "$as_me:$LINENO: checking for docbook-dtd412-xml" >&5
- echo $ECHO_N "checking for docbook-dtd412-xml... $ECHO_C" >&6
--	if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
-+	if test ! -f $LOCALBASE/share/xml/docbook/4.1.2/docbook.cat ; then
- 		echo "* ERROR * "
- 		echo " "
--		echo "Couldn't find the DocBook XML V4.1.2 DTD.  Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information."
-+		echo "Couldn't find the DocBook XML V4.1.2 DTD.  Please make sure that you have the docbook-dtd412-xml package installed."
- 		echo " "
--		{ { echo "$as_me:$LINENO: error: DocBook XML V4.1.2 DTD not present in /etc/xml/catalog. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." >&5
--echo "$as_me: error: DocBook XML V4.1.2 DTD not present in /etc/xml/catalog. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." >&2;}
-+		{ { echo "$as_me:$LINENO: error: DocBook XML V4.1.2 DTD not present in $LOCALBASE/share/xml. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." >&5
-+echo "$as_me: error: DocBook XML V4.1.2 DTD not present in $LOCALBASE/share/xml. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	echo "$as_me:$LINENO: result: found" >&5
+@@ -8360,7 +8361,7 @@
+ 	echo "$as_me:$LINENO: checking for DocBook XML DTD" >&5
+ echo $ECHO_N "checking for DocBook XML DTD... $ECHO_C" >&6
+ 	db_found=
+-	for vers in 4.2 4.1.2; do
++	for vers in 4.1.2 4.2; do
+ 	   if xmlcatalog $XML_CATALOG "-//OASIS//DTD DocBook XML V$vers//EN" >/dev/null ; then
+ 	      db_found=$vers
+ 	      break
diff --git a/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in b/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
index d5a44cddaf16..1fb855079121 100644
--- a/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
+++ b/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
@@ -1,15 +1,6 @@
---- extract/dtds/Makefile.in.orig	Wed Apr 23 00:40:45 2003
-+++ extract/dtds/Makefile.in	Wed Apr 23 00:41:44 2003
-@@ -138,7 +138,7 @@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
--CATALOG = $(sysconfdir)/xml/catalog
-+CATALOG = %%LOCALBASE%%/share/xml/catalog
- dtdsdir = $(datadir)/xml/scrollkeeper/dtds
- dtds_HEADERS = scrollkeeper-omf.dtd scrollkeeper-cl.dtd
- subdir = extract/dtds
-@@ -335,7 +335,7 @@
+--- extract/dtds/Makefile.in.orig	Sat Dec  6 17:43:49 2003
++++ extract/dtds/Makefile.in	Sat Dec  6 17:43:49 2003
+@@ -408,7 +408,7 @@
  
  # ScrollKeeper OMF Variation DTD V1.0
  install-data-hook:
diff --git a/textproc/scrollkeeper/files/patch-libs_install.c b/textproc/scrollkeeper/files/patch-libs_install.c
index 45c17709f0c5..e1162f1fd536 100644
--- a/textproc/scrollkeeper/files/patch-libs_install.c
+++ b/textproc/scrollkeeper/files/patch-libs_install.c
@@ -1,178 +1,14 @@
---- libs/install.c.orig	Thu Jan 23 01:10:57 2003
-+++ libs/install.c	Tue Nov  4 07:46:26 2003
-@@ -41,7 +41,7 @@
- static int get_unique_doc_id(char *);
- static void add_doc_to_scrollkeeper_docs(char *, char *, char *, int, char *);
- static void add_doc_to_content_list(xmlNodePtr, char *, char **, char *, char *,
--				    char *, char *, char *, int, int, char);
-+				    char *, char *, char *, int, int, char, char **);
- static char *get_doc_property(xmlNodePtr, char *, char *);
- static char *get_doc_parameter_value(xmlNodePtr, char *);
- static char* remove_leading_and_trailing_white_spaces(char *);
-@@ -113,6 +113,10 @@
-     
-     snprintf(command, 1024, "scrollkeeper-get-toc-from-docpath %s", docpath);
-     config_fid = popen(command, "r");
-+
-+    if (config_fid == NULL)
-+	return NULL;
-+
-     fscanf(config_fid, "%s", tocpath);
-     if (pclose(config_fid))
-         return NULL;
-@@ -219,8 +223,13 @@
- 	{
- 	    /* create full content list path names and read trees */
-     	    locale = get_doc_property(node, "language", "code");
--	    if (!get_best_locale_dir(locale_dir, locale_name, scrollkeeper_dir, locale))
-+	    if (locale == NULL)
-+		continue;
-+	    if (!get_best_locale_dir(locale_dir, locale_name, scrollkeeper_dir, locale)) {
-+		xmlFree(locale);
- 	        continue;
-+	    }
-+	    xmlFree(locale);
-     	    snprintf(cl_filename, PATHLEN, "%s/scrollkeeper_cl.xml", locale_dir);
- 	    snprintf(cl_ext_filename, PATHLEN, "%s/scrollkeeper_extended_cl.xml", locale_dir);
- 	    
-@@ -245,6 +254,8 @@
-     	    }
- 
- 	    docpath = get_doc_property(node, "identifier", "url");
-+	    if (docpath == NULL)
-+		continue;
- 	    
- 	    /* add to scrollkeeper_docs */
- 	    unique_id = get_unique_doc_id(scrollkeeper_docs);
-@@ -252,7 +263,7 @@
- 	    					locale_name);
- 						
- 	    format = get_doc_property(node, "format", "mime");
--	    if (!strcmp(format, "text/xml"))
-+	    if (format && !strcmp(format, "text/xml"))
- 	    {
- 	        /* create TOC file and index file */
- 
-@@ -304,6 +315,8 @@
- 	    }
- 	    
- 	    uid = get_doc_property(node, "relation", "seriesid");
-+	    if (uid == NULL)
-+		continue;
- 	    
- 	    title = get_doc_parameter_value(node, "title");
-     	    strncpy(str, title, 1024);
-@@ -315,18 +328,25 @@
- 	        /* look for subject nodes */
- 	        if (!xmlStrcmp(s_node->name, (xmlChar *)"subject"))
- 		{
--		    char *category, *token, *rest;
-+		    char *category, *token, *rest, *complete_cat_token = NULL;
- 
- 		    category = (char *)xmlGetProp(s_node, (xmlChar *)"category");
-+		    if (category == NULL)
-+			continue;
- 		    token = strtok_r(category, SEP, &rest);
- 		    add_doc_to_content_list(cl_doc->children->children, token, &rest,
--		    docpath, omf_name, title, format, uid, unique_id, 0, outputprefs);
--		    free((void *)category);
-+		    docpath, omf_name, title, format, uid, unique_id, 0, outputprefs,
-+			&complete_cat_token);
-+		    xmlFree(category);
-+		    free((void *)complete_cat_token);
- 		    category = (char *)xmlGetProp(s_node, (xmlChar *)"category");
- 		    token = strtok_r(category, SEP, &rest);
-+			complete_cat_token = NULL;
- 		    add_doc_to_content_list(cl_ext_doc->children->children, token, &rest,
--		    docpath, omf_name, title, format, uid, unique_id, 1, outputprefs);
--		    free((void *)category);
-+		    docpath, omf_name, title, format, uid, unique_id, 1, outputprefs,
-+			&complete_cat_token);
-+		    xmlFree(category);
-+		    free((void *)complete_cat_token);
- 		}
- 	    }
- 	    
-@@ -334,6 +354,9 @@
- 	    xmlFreeDoc(cl_doc);
- 	    xmlSaveFile(cl_ext_filename, cl_ext_doc);
- 	    xmlFreeDoc(cl_ext_doc);
-+        xmlFree(docpath);
-+	xmlFree(format);
-+	xmlFree(uid);
- 	}
-     }
-     
-@@ -409,6 +432,7 @@
- 	    unique_id = id;
-     }
- 
-+   fclose (fid);
-    return unique_id + 1;
- }
- 
-@@ -472,32 +496,38 @@
- static void add_doc_to_content_list(xmlNodePtr sect_node, char *cat_token, char **rest,
- 				    char *docpath, char *omf_name,
- 				    char *title, char *format, char *uid,
--				    int id, int add_toc, char outputprefs)
-+				    int id, int add_toc, char outputprefs, char **complete_cat_token)
- {
--    xmlNodePtr node, new_node, t_node, s_node;
-+    xmlNodePtr node, new_node, s_node;
- 
-     if (sect_node == NULL ||
-         cat_token == NULL)
-         return;
- 
-+	if (*complete_cat_token == NULL)
-+		*complete_cat_token = strdup(cat_token);
-+	else {
-+		char *ptr;
-+		ptr = malloc(strlen(*complete_cat_token) + strlen(cat_token) + 2);
-+		sprintf(ptr, "%s%s", *complete_cat_token, cat_token);
-+		free(*complete_cat_token);
-+		*complete_cat_token = ptr;
-+	}
-+
+--- libs/install.c.orig	Sat Dec  6 17:47:34 2003
++++ libs/install.c	Sat Dec  6 17:47:47 2003
+@@ -517,10 +517,9 @@
      /* these should all be <sect> nodes */	    
      for(node = sect_node; node != NULL; node = node->next)
      {
 +	xmlChar *categorycode;
-+
      	if (xmlStrcmp(node->name, (xmlChar *)"sect"))
  	    continue;
--	    
--	for(t_node = node->children; t_node != NULL; t_node = t_node->next)
--	{
--    	    /* these should be <title>, <sect> or <doc> nodes */
--            if (t_node->type == XML_ELEMENT_NODE &&
--	        !xmlStrcmp(t_node->name, (xmlChar *)"title"))
--		break;
--	}
-+	
-+	categorycode = xmlGetProp(node, (xmlChar *)"categorycode");
-+	if (categorycode == NULL)
-+	    continue;
+-	
+-	xmlChar *categorycode;
  	
- 	/* these should be the actual titles */
--	if (t_node != NULL && t_node->children != NULL &&
--	    t_node->children->type == XML_TEXT_NODE &&
--	    !xmlStrcmp((xmlChar *)cat_token, t_node->children->content))
-+	if (!xmlStrcmp((xmlChar *)(*complete_cat_token), categorycode))
- 	{
- 	        cat_token = strtok_r(NULL, SEP, rest);
- 		if (cat_token == NULL)
-@@ -536,9 +566,11 @@
- 		    if (s_node != NULL)
- 		        add_doc_to_content_list(s_node, cat_token, rest, 
- 						docpath, omf_name, title, format,
--						uid, id, add_toc, outputprefs);
-+						uid, id, add_toc, outputprefs, complete_cat_token);
- 		    return;
- 		}
- 	}	
-+	
-+	xmlFree(categorycode);
-     }
- }
+ 	categorycode = xmlGetProp(node, (xmlChar *)"categorycode");
+ 	if (categorycode == NULL)
diff --git a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
index 70de8ee538f5..c8a8d3400623 100644
--- a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
+++ b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
@@ -5,7 +5,7 @@
  #define SCROLLKEEPERLOGFILE "@localstatedir@/log/scrollkeeper.log"
  #define SCROLLKEEPERLOGFILE_ROT "@localstatedir@/log/scrollkeeper.log.1"
 -#define SCROLLKEEPER_OMF_DTD "@prefix@/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
-+#define SCROLLKEEPER_OMF_DTD "@datadir@/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
++#define SCROLLKEEPER_OMF_DTD "@prefix@/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
  #define PATHLEN		256
  
  /*