Update to 0.3.12. There have been lots of changes since 0.2 (this version

is almost a rewrite of the program).  Note that this is still a development
version but includes new features that may be required by packages using
scrollkeeper (which won't work with the old 0.2).

Provide a framework to automatically rebuild scrollkeeper's database from
packages installing OMF files under share/omf/;  they only need to include
omf.mk in their Makefile and take care to install OMF files in the said
directory.

Reviewed by rh and wiz.

5 files changed, 91 insertions, 111 deletions

diff --git a/textproc/scrollkeeper/patches/patch-aa b/textproc/scrollkeeper/patches/patch-aa
index 6e04a98edc9..69e5d51410d 100644
--- a/textproc/scrollkeeper/patches/patch-aa
+++ b/textproc/scrollkeeper/patches/patch-aa
@@ -1,22 +1,21 @@
-$NetBSD: patch-aa,v 1.4 2002/10/11 09:25:55 rh Exp $
+$NetBSD: patch-aa,v 1.5 2003/02/18 14:39:04 jmmv Exp $
 
---- toc/src/toc-extract.c.orig	Fri Oct 13 00:53:39 2000
-+++ toc/src/toc-extract.c
-@@ -97,7 +97,7 @@
+--- configure.orig	2003-01-23 07:12:13.000000000 +0100
++++ configure
+@@ -8795,7 +8795,7 @@ case "$host_os" in
+    *)
+ 	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 xmlcatalog ${prefix}/share/xml/catalog "-//OASIS//DTD DocBook XML V4.2//EN" | grep "No entry" >/dev/null; 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."
+@@ -11523,6 +11523,7 @@ case "$host_os" in
+         SCROLLKEEPER_PARTIAL_DB_DIR=lib/scrollkeeper
+ 	;;
+ esac
++SCROLLKEEPER_PARTIAL_DB_DIR=db
  
- 		stack_el = find_first_element (context, element_list);
- 
--		if (!stack_el->ignore)
-+		if (stack_el != NULL && !stack_el->ignore)
- 		{
- 			print_indent(context->depth);
- 			printf("</tocsect%d>\n", context->depth-1);
-@@ -190,7 +190,7 @@
- 
- 	stack_el = find_first_element (context, element_list);
- 	
--	if (stack_el->title_output)
-+	if (stack_el == NULL || stack_el->title_output)
- 	{
- 		list_free (element_list);
- 		return;
+ echo "$as_me:$LINENO: result: partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&5
+ echo "${ECHO_T}partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&6
diff --git a/textproc/scrollkeeper/patches/patch-ab b/textproc/scrollkeeper/patches/patch-ab
index 8c78ae3949d..b15612c8c7d 100644
--- a/textproc/scrollkeeper/patches/patch-ab
+++ b/textproc/scrollkeeper/patches/patch-ab
@@ -1,21 +1,41 @@
-$NetBSD: patch-ab,v 1.2 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ab,v 1.3 2003/02/18 14:39:04 jmmv Exp $
 
---- cl/src/get-cl.c.orig	Thu Mar 15 21:10:33 2001
-+++ cl/src/get-cl.c
-@@ -19,6 +19,7 @@
- #include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <libintl.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -29,7 +30,7 @@
+--- libs/i18n.c.orig	2003-01-23 07:10:57.000000000 +0100
++++ libs/i18n.c
+@@ -62,21 +62,31 @@ static int explode_locale(const char *lo
  
- #define SCROLLKEEPERLOCALEDIR "/usr/share/locale"
+ 	if (dot_pos) {
+ 		mask |= CODESET;
+-		*codeset = strndup(dot_pos, at_pos - dot_pos);
+-	} else {
++		*codeset = (char*) malloc(at_pos - dot_pos + 1);
++		strncpy(*codeset, dot_pos, at_pos - dot_pos);
++		*codeset[at_pos - dot_pos] = '\0';
++	}
++	if (!dot_pos || !*codeset) {
+ 		dot_pos = at_pos;
+ 		*codeset = strdup("");
+ 	}
  
--#define PATHLEN	256
-+#define PATHLEN	MAXPATHLEN
+ 	if (uscore_pos) {
+ 		mask |= TERRITORY;
+-		*territory = strndup(uscore_pos, dot_pos - uscore_pos);
+-	} else {
++		*territory = (char*) malloc(dot_pos - uscore_pos + 1);
++		strncpy(*territory, uscore_pos, dot_pos - uscore_pos);
++		*territory[dot_pos - uscore_pos] = '\0';
++	}
++	if (!uscore_pos || !*territory) {
+ 		uscore_pos = dot_pos;
+ 		*territory = strdup("");
+ 	}
  
- static char **av;
+-	*language = strndup(locale, uscore_pos - locale);
++	*language = (char*) malloc(uscore_pos - locale + 1);
++	if (*language) {
++		strncpy(*language, locale, uscore_pos - locale);
++		*language[uscore_pos - locale] = '\0';
++	}
  
+ 	return mask;
+ }
diff --git a/textproc/scrollkeeper/patches/patch-ac b/textproc/scrollkeeper/patches/patch-ac
index 95961c70b92..02b5c94f493 100644
--- a/textproc/scrollkeeper/patches/patch-ac
+++ b/textproc/scrollkeeper/patches/patch-ac
@@ -1,41 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ac,v 1.4 2003/02/18 14:39:04 jmmv Exp $
 
---- cl/src/install.c.orig	Thu Mar 15 21:10:33 2001
-+++ cl/src/install.c
-@@ -24,6 +24,7 @@
- #include <locale.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <errno.h>
- #include <libintl.h>
- #include <dirent.h>
-@@ -34,7 +35,7 @@
- #define _(String) gettext (String)
+--- config/Makefile.in.orig	2003-01-23 07:11:59.000000000 +0100
++++ config/Makefile.in
+@@ -141,7 +141,7 @@ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
  
- #define SEP		"|"
--#define PATHLEN		256
-+#define PATHLEN		MAXPATHLEN
+-pkgconfigdir = $(sysconfdir)
++pkgconfigdir = $(datadir)/examples/scrollkeeper
  
- static int verbose = 0;
- 
-@@ -512,7 +513,7 @@
- 	{
- 	    char source_file[PATHLEN], target_file[PATHLEN];
- 	
--	    sprintf(command, "mkdir %s/%s", scrollkeeper_dir, dir_ent->d_name);
-+	    sprintf(command, "mkdir -p %s/%s", scrollkeeper_dir, dir_ent->d_name);
- 	    system(command);
- 	    sprintf(source_file, "%s/scrollkeeper_cl.xml", source_path);
- 	    sprintf(target_file, "%s/%s/scrollkeeper_cl.xml", 
-@@ -610,7 +611,9 @@
-     stat(toc_dir, &buf);
-     if (!S_ISDIR(buf.st_mode))
-     {
--        sprintf(command, "mkdir %s", toc_dir);
-+        sprintf(command, "rm -f %s", toc_dir);
-+	system(command);
-+        sprintf(command, "mkdir -p %s", toc_dir);
- 	system(command);
-     }
+ pkgconfig_DATA = scrollkeeper.conf
  
diff --git a/textproc/scrollkeeper/patches/patch-ad b/textproc/scrollkeeper/patches/patch-ad
index 68b67213c26..cb7972d73b7 100644
--- a/textproc/scrollkeeper/patches/patch-ad
+++ b/textproc/scrollkeeper/patches/patch-ad
@@ -1,21 +1,18 @@
-$NetBSD: patch-ad,v 1.1 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ad,v 1.2 2003/02/18 14:39:04 jmmv Exp $
 
---- cl/src/uninstall.c.orig	Thu Mar 15 21:10:33 2001
-+++ cl/src/uninstall.c
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <libintl.h>
- #include <locale.h>
- #include <scrollkeeper.h>
-@@ -31,7 +32,7 @@
+--- Makefile.in.orig	2003-01-23 07:11:56.000000000 +0100
++++ Makefile.in
+@@ -536,13 +536,6 @@ dist-hook: scrollkeeper.spec
  
- #define _(String) gettext (String)
+ # Build/rebuild the catalog
+ install-data-hook:
+-	rm -rf $(DESTDIR)$(scrollkeeper_localstate_dir)
+-	$(mkinstalldirs) $(DESTDIR)$(scrollkeeper_localstate_dir)
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
+-	PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
+-		echo "`date +\"%b %d %X\"` Installing ScrollKeeper `scrollkeeper-config --version`..." >> $(DESTDIR)$(localstatedir)/log/scrollkeeper.log
+-	PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
+-		$(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p $(DESTDIR)$(scrollkeeper_localstate_dir)
  
--#define PATHLEN		256
-+#define PATHLEN		MAXPATHLEN
- 
- struct IdTab {
-     int id;
+ # Remove generated files
+ uninstall-local:
diff --git a/textproc/scrollkeeper/patches/patch-ae b/textproc/scrollkeeper/patches/patch-ae
index 764288f10ff..f4c7984e474 100644
--- a/textproc/scrollkeeper/patches/patch-ae
+++ b/textproc/scrollkeeper/patches/patch-ae
@@ -1,21 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ae,v 1.2 2003/02/18 14:39:04 jmmv Exp $
 
---- cl/src/update.c.orig	Thu Mar 15 21:10:33 2001
-+++ cl/src/update.c
-@@ -19,6 +19,7 @@
- #include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -32,7 +33,7 @@
- 
- #define SCROLLKEEPERLOCALEDIR "/usr/share/locale"
- 
--#define PATHLEN	256
-+#define PATHLEN	MAXPATHLEN
- 
- char **av;
- 
+--- libs/extract.c.orig	2003-01-23 07:10:57.000000000 +0100
++++ libs/extract.c
+@@ -147,7 +147,7 @@ int apply_stylesheets (char *input_file,
+ 			fputs(line, res_fid);
+ 			if (num == 0) {
+ 				num = 1;
+-				fprintf(res_fid, "<!DOCTYPE %s PUBLIC \"-//OASIS//DTD DocBook V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">\n", doctype);
++				fprintf(res_fid, "<!DOCTYPE %s PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\">\n", doctype);
+ 			}
+ 		}
+ 		fclose(fid);