12 files changed, 142 insertions, 43 deletions

diff --git a/textproc/scrollkeeper/files/patch-Makefile.in b/textproc/scrollkeeper/files/patch-Makefile.in
index 3f03c6005bb2..712b385535af 100644
--- a/textproc/scrollkeeper/files/patch-Makefile.in
+++ b/textproc/scrollkeeper/files/patch-Makefile.in
@@ -1,21 +1,27 @@
---- Makefile.in.orig	Wed Mar 28 06:22:13 2001
-+++ Makefile.in	Tue Apr  3 11:13:37 2001
-@@ -108,4 +108,2 @@
+--- Makefile.in.orig	Sat May 25 22:59:08 2002
++++ Makefile.in	Sat May 25 23:09:40 2002
+@@ -130,14 +130,12 @@
+ 
+ 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
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -114,3 +112,3 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =  scrollkeeper.spec
 -DATA =  $(scrollkeeperdoc_DATA)
-+DATA = 
- 
-@@ -353,3 +351,3 @@
++DATA =
  
--install-data-am: install-scrollkeeperdocDATA
-+install-data-am:
- install-data: install-data-recursive
-@@ -367,3 +365,2 @@
+ DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
+ INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
+@@ -393,7 +391,6 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs: installdirs-recursive
  installdirs-am:
 -	$(mkinstalldirs)  $(DESTDIR)$(scrollkeeperdocdir)
  
+ 
+ mostlyclean-generic:
diff --git a/textproc/scrollkeeper/files/patch-buildtools_separate.c b/textproc/scrollkeeper/files/patch-buildtools_separate.c
new file mode 100644
index 000000000000..376cb5c7fd66
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-buildtools_separate.c
@@ -0,0 +1,10 @@
+--- buildtools/separate.c.orig	Mon Jun 17 15:09:34 2002
++++ buildtools/separate.c	Mon Jun 17 15:09:27 2002
+@@ -242,6 +242,7 @@
+ 					xmlUnlinkNode(w_node);
+ 					xmlFreeNode(w_node);
+ 				}
++				continue;
+ 			}
+ 			else {
+ 				if (strcmp(lang, "C")) {
diff --git a/textproc/scrollkeeper/files/patch-cl::src::install.c b/textproc/scrollkeeper/files/patch-cl::src::install.c
deleted file mode 100644
index f8e7c4326df8..000000000000
--- a/textproc/scrollkeeper/files/patch-cl::src::install.c
+++ /dev/null
@@ -1,8 +0,0 @@
---- cl/src/install.c.orig	Thu Mar 15 05:10:33 2001
-+++ cl/src/install.c	Tue Apr  3 20:41:52 2001
-@@ -499,3 +499,4 @@
-     
--    dir = opendir(data_dir);
-+    if ((dir = opendir(data_dir)) == NULL)
-+	return;
-     
diff --git a/textproc/scrollkeeper/files/patch-cl_preinstall.c b/textproc/scrollkeeper/files/patch-cl_preinstall.c
new file mode 100644
index 000000000000..2e89129b9efd
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-cl_preinstall.c
@@ -0,0 +1,20 @@
+--- cl/src/preinstall.c	2001/07/14 10:49:05	1.15
++++ cl/src/preinstall.c	2002/06/02 04:25:51	1.16
+@@ -65,7 +65,16 @@
+     omf_new_name = argv[3];
+ 
+     if (!update_doc_url_in_omf_file(omf_name, url, omf_new_name)) {
+-    	fprintf(stderr, _("url update in OMF file %s failed\n"), omf_name);
++    	fprintf(stderr, _("Unable to update URL in OMF file %s.  Copying OMF file unchanged.\n"), omf_name);
++
++        /*
++         *  Copy the old file to the new name, since the missing file will
++	 *  break some packaging systems.  In these cases, it is better to
++	 *  at least get a package, even if a doc or two isn't registered
++	 *  properly than to not get a package built at all.
++         */
++	copy_file(omf_name, omf_new_name);
++
+ 	return 1;
+     }
+             
diff --git a/textproc/scrollkeeper/files/patch-cl_src_update.c b/textproc/scrollkeeper/files/patch-cl_src_update.c
new file mode 100644
index 000000000000..e39c97bd6793
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-cl_src_update.c
@@ -0,0 +1,11 @@
+--- cl/src/update.c.orig	Tue May 14 00:45:54 2002
++++ cl/src/update.c	Tue May 14 00:47:01 2002
+@@ -304,7 +304,7 @@
+ 
+ 	config_omf_dir[0] = '\0';
+ 
+-	fid = fopen("/etc/scrollkeeper.conf", "r");
++	fid = fopen("%%PREFIX%%/etc/scrollkeeper.conf", "r");
+ 	if (fid == NULL) {
+ 		return;
+ 	}
diff --git a/textproc/scrollkeeper/files/patch-cl_templates_Makefile.in b/textproc/scrollkeeper/files/patch-cl_templates_Makefile.in
new file mode 100644
index 000000000000..9a16074e6de2
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-cl_templates_Makefile.in
@@ -0,0 +1,11 @@
+--- cl/templates/Makefile.in.orig	Tue Jun 18 15:13:52 2002
++++ cl/templates/Makefile.in	Tue Jun 18 15:13:37 2002
+@@ -130,7 +130,7 @@
+ EXTRA_DIST = scrollkeeper_cl.xml.in
+ LIB_PATH = $(top_builddir)/libs/.libs
+ 
+-TRANSLATED_LOCALES = C ca da de el es fr hu it ja ko nb nl no pl pt_BR ru sk sl sv tr uk, zh_TW
++TRANSLATED_LOCALES = C ca da de el es fr hu it ja ko nb nl no pl pt_BR ru sk sl sv tr uk zh_TW
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/textproc/scrollkeeper/files/patch-configure b/textproc/scrollkeeper/files/patch-configure
new file mode 100644
index 000000000000..9a5f81c93227
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig	Mon Jun  3 13:49:14 2002
++++ configure	Mon Jun  3 13:50:53 2002
+@@ -5299,6 +5299,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -6279,7 +6280,7 @@
+    *)
+ 	echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6
+ echo "configure:6282: checking for docbook-dtd412-xml" >&5
+-	if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
++	if xmlcatalog $LOCALBASE/share/xml/catalog "-//OASIS//DTD DocBook XML V4.1.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."
+@@ -7181,7 +7182,7 @@
+     else
+             echo $ac_n "checking version of bison""... $ac_c" 1>&6
+ echo "configure:7184: checking version of bison" >&5
+-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
++      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+       case $ac_prog_version in
+         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+         1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
diff --git a/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in b/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
new file mode 100644
index 000000000000..fb2f768303bc
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in
@@ -0,0 +1,20 @@
+--- extract/dtds/Makefile.in.orig	Mon Jun  3 15:23:05 2002
++++ extract/dtds/Makefile.in	Mon Jun  3 15:24:07 2002
+@@ -125,7 +125,7 @@
+ XSLT_CONFIG = @XSLT_CONFIG@
+ XSLT_LIBS = @XSLT_LIBS@
+ 
+-CATALOG = $(sysconfdir)/xml/catalog
++CATALOG = %%LOCALBASE%%/share/xml/catalog
+ dtdsdir = $(datadir)/xml/scrollkeeper/dtds
+ dtds_HEADERS = scrollkeeper-omf.dtd scrollkeeper-cl.dtd
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -282,7 +282,7 @@
+ 	#
+ 
+ 	# ScrollKeeper OMF Variation DTD V1.0
+-	-/usr/bin/xmlcatalog --noout --add "public" \
++	-%%LOCALBASE%%/bin/xmlcatalog --noout --add "public" \
+ 		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+ 		"$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
+ 
diff --git a/textproc/scrollkeeper/files/patch-libs_database.c b/textproc/scrollkeeper/files/patch-libs_database.c
new file mode 100644
index 000000000000..4a9c6a771fc4
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-libs_database.c
@@ -0,0 +1,12 @@
+--- libs/database.c.orig	Sat May 25 23:17:10 2002
++++ libs/database.c	Sat May 25 23:18:01 2002
+@@ -73,7 +73,8 @@
+     
+     /* create locale directories and symlinks */
+     
+-    dir = opendir(data_dir);
++    if ((dir = opendir(data_dir)) == NULL)
++	return;
+     
+     while((dir_ent = readdir(dir)) != NULL)
+     {
diff --git a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
new file mode 100644
index 000000000000..70de8ee538f5
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
@@ -0,0 +1,11 @@
+--- libs/scrollkeeper.h.in.orig	Mon Jun  3 14:00:51 2002
++++ libs/scrollkeeper.h.in	Mon Jun  3 14:01:11 2002
+@@ -32,7 +32,7 @@
+ #define SCROLLKEEPERLOCALEDIR "/usr/X11R6/share/locale"
+ #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 PATHLEN		256
+ 
+ /*
diff --git a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in b/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
index 2d2deabe3497..0185737cea7d 100644
--- a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
+++ b/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
@@ -1,5 +1,5 @@
---- scripts/scrollkeeper-config.in.orig	Sun May 26 16:19:07 2002
-+++ scripts/scrollkeeper-config.in	Sun May 26 16:19:13 2002
+--- scripts/scrollkeeper-config.in.orig	Thu Mar 21 00:08:51 2002
++++ scripts/scrollkeeper-config.in	Sat May 25 23:59:53 2002
 @@ -4,7 +4,7 @@
  localstatedir=@localstatedir@
  partial_db_dir=@SCROLLKEEPER_PARTIAL_DB_DIR@
diff --git a/textproc/scrollkeeper/files/patch-toc_src_toc-extract.c b/textproc/scrollkeeper/files/patch-toc_src_toc-extract.c
deleted file mode 100644
index 628db1cf0aae..000000000000
--- a/textproc/scrollkeeper/files/patch-toc_src_toc-extract.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- toc/src/toc-extract.c.orig	Sun May 26 17:12:20 2002
-+++ toc/src/toc-extract.c	Sun May 26 17:12:54 2002
-@@ -97,6 +97,9 @@
- 
- 		stack_el = find_first_element (context, element_list);
- 
-+		if (stack_el == NULL)
-+		    return;
-+
- 		if (!stack_el->ignore)
- 		{
- 			print_indent(context->depth);
-@@ -189,6 +192,9 @@
- 	element_list = list_prepend (element_list, (void *) (SECT5));
- 
- 	stack_el = find_first_element (context, element_list);
-+
-+	if (stack_el == NULL)
-+	    return;
- 	
- 	if (stack_el->title_output)
- 	{