Update to 0.3.11 to support more recent apps that use it.

Also take MAINTAINER. ok nino@
2002-11-30 04:41:29 +00:00 · 2002-11-30 04:41:29 +00:00 · cef71b8639
commit cef71b8639
parent 4dbdf49237
18 changed files with 650 additions and 338 deletions
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@ -1,33 +1,43 @@
-# $OpenBSD: Makefile,v 1.9 2002/09/20 08:15:15 nino Exp $
+# $OpenBSD: Makefile,v 1.10 2002/11/30 04:41:29 marcm Exp $

 COMMENT=		"Scrollkeeper Open Documentation Cataloging System"

-DISTNAME=		scrollkeeper-0.2
+DISTNAME=		scrollkeeper-0.3.11
 CATEGORIES=		textproc

 HOMEPAGE=		http://scrollkeeper.sourceforge.net
-MAINTAINER=		Nils Nordman <nino@openbsd.org>

-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/scrollkeeper/0.2/}
+MAINTAINER=		Marc Matteo <marcm@openbsd.org>

-MODULES=		gettext
-LIB_DEPENDS=		xml.9::textproc/libxml1
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/scrollkeeper/0.3/}
+EXTRACT_SUFX=		.tar.bz2

+# LGPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+MODULES=		gettext
+
+BUILD_DEPENDS=		:docbook->=4.1.2:textproc/docbook \
+			:intltool->=0.8.4:textproc/intltool
+RUN_DEPENDS=		:docbook->=4.1.2:textproc/docbook
+LIB_DEPENDS=		xml2.6::textproc/libxml \
+			xslt.1::textproc/libxslt
+
+USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= 	--localstatedir=/var
+CONFIGURE_ARGS+=	--with-omfdirs=${LOCALBASE}/share/omf
 CONFIGURE_ENV=   	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

-post-extract:
-	@find ${WRKSRC}/cl/templates -name Makefile.in | xargs \
-	perl -pi -e 's|data_link_dir = \$$\(datadir\)/scrollkeeper/Templates/|data_link_dir = |g; \
-		     s|\$$\(LN_S\) -f -n \$$\(DESTDIR\)|\$$\(LN_S\) -f |g'
-	@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
+post-install:
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/xml; \
+	sh ${FILESDIR}/buildDocBookCatalog.openbsd
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scrollkeeper; \
+	cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/scrollkeeper/

 .include <bsd.port.mk>
--- a/textproc/scrollkeeper/distinfo
+++ b/textproc/scrollkeeper/distinfo
@ -1,3 +1,3 @@
-MD5 (scrollkeeper-0.2.tar.gz) = a10cb1fae040525e50b1b05dc06dc9a7
-RMD160 (scrollkeeper-0.2.tar.gz) = 424645a1c63ac32621aaf90f33a076bac33b71c5
-SHA1 (scrollkeeper-0.2.tar.gz) = 2f1f7ce884d64d3f7e6222a373372635cdf8508e
+MD5 (scrollkeeper-0.3.11.tar.bz2) = 91212198f6d11adabdaf429d24acb21c
+RMD160 (scrollkeeper-0.3.11.tar.bz2) = 134ea07dcba93bd2c32a5e2509bc9414c980f0e8
+SHA1 (scrollkeeper-0.3.11.tar.bz2) = a7be5a22372d22eccb599bd4f0e3996f4b6c174c
--- a/textproc/scrollkeeper/files/buildDocBookCatalog.openbsd
+++ b/textproc/scrollkeeper/files/buildDocBookCatalog.openbsd
@ -0,0 +1,142 @@
+#!/bin/sh
+#
+# $OpenBSD: buildDocBookCatalog.openbsd,v 1.1 2002/11/30 04:41:29 marcm Exp $
+#
+# Based (very) loosly on: http://xmlsoft.org/buildDocBookCatalog
+
+# Setup...
+_rootcatalog="share/xml/catalog.scrollkeeper"
+_catalog="share/xml/docbook.scrollkeeper"
+ROOTCATALOG="$PREFIX/$_rootcatalog"
+CATALOG="$PREFIX/$_catalog"
+TRUEROOTCATALOG="$TRUEPREFIX/$_rootcatalog"
+TRUECATALOG="$TRUEPREFIX/$_catalog"
+docbookdir="$TRUEPREFIX/share/xml/docbook/4.1.2"
+isodir="$docbookdir/ent"
+
+echo "Installing root catalog into $ROOTCATALOG"
+echo "Installing docbook catalog into $CATALOG"
+
+# Create the catalogs if necessary...
+if [ ! -r $ROOTCATALOG ] ; then
+	$TRUEPREFIX/bin/xmlcatalog --noout --create $ROOTCATALOG
+fi
+if [ ! -r $CATALOG ] ; then
+	$TRUEPREFIX/bin/xmlcatalog --noout --create $CATALOG
+fi
+
+# docbook catalog...
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
+    "file://$docbookdir/dbpoolx.mod" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
+    "file://$docbookdir/docbookx.dtd" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
+    "file://$docbookdir/dbcentx.mod" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
+    "file://$docbookdir/dbnotnx.mod" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
+    "file://$docbookdir/dbgenent.mod" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
+    "file://$docbookdir/dbhierx.mod" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+    "file://$docbookdir/soextblx.dtd" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
+    "file://$docbookdir/calstblx.dtd" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/4.1.2" \
+    "file://$docbookdir" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/4.1.2" \
+    "file://$docbookdir" $CATALOG
+
+# root catalog...
+$TRUEPREFIX/bin/xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file://$TRUECATALOG" $ROOTCATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file://$TRUECATALOG" $ROOTCATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file://$TRUECATALOG" $ROOTCATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file://$TRUECATALOG" $ROOTCATALOG
+
+# iso entities...
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Publishing//EN" \
+    "file://$isodir/iso-pub.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
+    "file://$isodir/iso-grk1.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
+    "file://$isodir/iso-box.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
+    "file://$isodir/iso-grk3.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
+    "file://$isodir/iso-amsn.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
+    "file://$isodir/iso-num.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
+    "file://$isodir/iso-grk4.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
+    "file://$isodir/iso-dia.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
+    "file://$isodir/iso-grk2.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
+    "file://$isodir/iso-amsa.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
+    "file://$isodir/iso-amso.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
+    "file://$isodir/iso-cyr1.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES General Technical//EN" \
+    "file://$isodir/iso-tech.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
+    "file://$isodir/iso-amsc.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
+    "file://$isodir/iso-lat1.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
+    "file://$isodir/iso-amsb.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
+    "file://$isodir/iso-lat2.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
+    "file://$isodir/iso-amsr.ent" $CATALOG
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
+    "file://$isodir/iso-cyr2.ent" $CATALOG
+
+$TRUEPREFIX/bin/xmlcatalog --noout --add "delegatePublic" \
+    "ISO 8879:1986" \
+    "file://$TRUECATALOG" $ROOTCATALOG
+
+# Scrollkeeper...
+$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
+    "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+    "file://$TRUEPREFIX/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $ROOTCATALOG
+
+echo "Done."
--- a/textproc/scrollkeeper/patches/patch-Makefile_in
+++ b/textproc/scrollkeeper/patches/patch-Makefile_in
@ -0,0 +1,18 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- Makefile.in.orig	Sun Sep  8 00:21:43 2002
+++ Makefile.in	Sun Sep  8 00:21:54 2002
+@@ -448,14 +448,6 @@ dist-hook: scrollkeeper.spec
+ 	cp scrollkeeper.spec $(distdir)
+ 
+ install-data-hook:
+-	# Build/rebuild the catalog
+-	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)
+ 
+ uninstall-local:
+ 	# Remove generated files
--- a/textproc/scrollkeeper/patches/patch-buildtools_Makefile_in
+++ b/textproc/scrollkeeper/patches/patch-buildtools_Makefile_in
@ -0,0 +1,19 @@
+$OpenBSD: patch-buildtools_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- buildtools/Makefile.in.orig	Wed Jul 24 19:27:31 2002
+++ buildtools/Makefile.in	Sat Sep  7 18:32:30 2002
+@@ -154,13 +154,13 @@ PROGRAMS =  $(noinst_PROGRAMS)
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L$(top_builddir)/libs/.libs @LDFLAGS@
+ LIBS = @LIBS@
+ scrollkeeper_tree_separate_OBJECTS =  separate.$(OBJEXT)
+ scrollkeeper_tree_separate_LDADD = $(LDADD)
+ scrollkeeper_tree_separate_DEPENDENCIES =  \
+ $(top_builddir)/libs/libscrollkeeper.la
+-scrollkeeper_tree_separate_LDFLAGS = 
+scrollkeeper_tree_separate_LDFLAGS =  $(INTLLIBS)
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/textproc/scrollkeeper/patches/patch-cl_src_Makefile_in
+++ b/textproc/scrollkeeper/patches/patch-cl_src_Makefile_in
@ -0,0 +1,20 @@
+$OpenBSD: patch-cl_src_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- cl/src/Makefile.in.orig	Wed Jul 24 19:27:37 2002
+++ cl/src/Makefile.in	Sat Sep  7 18:23:12 2002
+@@ -135,6 +135,7 @@ INCLUDES = \
+ LDADD = \
+         $(XML_LIBS) \
+ 	$(XSLT_LIBS) \
+	$(INTLLIBS) \
+ 	$(top_builddir)/libs/libscrollkeeper.la
+ 
+ 
+@@ -170,7 +171,7 @@ PROGRAMS =  $(bin_PROGRAMS)
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L$(top_builddir)/libs/.libs @LDFLAGS@
+ LIBS = @LIBS@
+ scrollkeeper_preinstall_OBJECTS =  preinstall.$(OBJEXT)
+ scrollkeeper_preinstall_LDADD = $(LDADD)
--- a/textproc/scrollkeeper/patches/patch-configure
+++ b/textproc/scrollkeeper/patches/patch-configure
@ -1,14 +1,137 @@
-$OpenBSD: patch-configure,v 1.1 2001/09/20 01:32:03 naddy Exp $
--- configure.orig	Wed Mar 28 14:00:09 2001
-+++ configure	Thu Sep 20 03:08:20 2001
-@@ -3152,6 +3152,10 @@ fi
+$OpenBSD: patch-configure,v 1.2 2002/11/30 04:41:29 marcm Exp $
+--- configure.orig	Wed Jul 24 19:26:07 2002
+++ configure	Mon Sep  9 12:46:15 2002
+@@ -28,6 +28,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset
+     *-DOS) lt_cv_sys_path_separator=';' ;;
+     *)     lt_cv_sys_path_separator=':' ;;
+   esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
+ fi
 
- 	   fi
 
-+	   if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+	     LIBS="$LIBS -lintl";
-+	   fi
+@@ -1959,6 +1960,16 @@ newos6*)
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
 +
- 	   if test "$gt_cv_func_gettext_libc" = "yes" \
- 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
- 	      cat >> confdefs.h <<\EOF
+ osf3* | osf4* | osf5*)
+   # this will be overridden with pass_all, but let us keep it just in case
+   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+@@ -2724,7 +2735,14 @@ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+  case "$host_os" in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+  ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+  ;;
+  esac
+ fi
+ 
+ # Allow CC to be a program name with arguments.
+@@ -3221,7 +3239,9 @@ cygwin* | mingw* | pw32* )
+     with_gnu_ld=no
+   fi
+   ;;
+-
+openbsd*)
+  with_gnu_ld=no
+  ;;
+ esac
+ 
+ ld_shlibs=yes
+@@ -3625,10 +3645,24 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='${wl}-R$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+    else
+      case "$host_os" in
+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_libdir_flag_spec='-R$libdir'
+	;;
+      *)
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-R$libdir'
+	;;
+      esac
+    fi
+     ;;
+ 
+   os2*)
+@@ -4105,9 +4139,22 @@ newsos6)
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+  need_lib_prefix=no
+  need_version=no
+  sys_lib_search_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    case "$host_os" in
+    openbsd2.[89] | openbsd2.[89].*)
+      shlibpath_overrides_runpath=no
+    ;;
+    *)
+      shlibpath_overrides_runpath=yes
+    ;;
+    esac
+  else
+    shlibpath_overrides_runpath=yes
+   fi
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+@@ -6279,7 +6326,7 @@ case "$host_os" in
+    *)
+ 	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 $(eval echo ${datadir})/xml/docbook/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."
+@@ -6826,6 +6873,10 @@ echo "$ac_t""$gt_cv_func_gnugettext1_lib
+ #define HAVE_GETTEXT 1
+ EOF
+ 
+             if test "$gt_cv_func_gettext_libintl" = "yes"; then
+                  LIBS="$LIBS -lintl";
+             fi
+
+ 
+ 	     if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+ 	       	       	       	       INTLLIBS="-lintl $LIBICONV"
+@@ -7325,7 +7376,7 @@ fi
+ 
+ echo "$ac_t""setting up partial database directory ..." 1>&6
+ case "$host_os" in
+-   freebsd*)
+   freebsd*|openbsd*)
+ 	SCROLLKEEPER_PARTIAL_DB_DIR=db/scrollkeeper
+ 	;;
+    *)
--- a/textproc/scrollkeeper/patches/patch-doc_writing_scrollkeeper_omf_files_C_Makefile_in
+++ b/textproc/scrollkeeper/patches/patch-doc_writing_scrollkeeper_omf_files_C_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_writing_scrollkeeper_omf_files_C_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- doc/writing_scrollkeeper_omf_files/C/Makefile.in.orig	Sat Jun  1 08:17:42 2002
+++ doc/writing_scrollkeeper_omf_files/C/Makefile.in	Wed Jul 24 12:31:57 2002
+@@ -299,7 +299,7 @@ omf: omf_timestamp
+ 
+ omf_timestamp: $(omffile)
+ 	-for file in $(omffile); do \
+-	  $(top_builddir)/cl/src/scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $(srcdir)/$$file.out; \
+	  LD_PRELOAD=$(top_builddir)/libs/.libs/libscrollkeeper.so.1.0 $(top_builddir)/cl/src/scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $(srcdir)/$$file.out; \
+ 	done
+ 	touch omf_timestamp
+ 
--- a/textproc/scrollkeeper/patches/patch-extract_dtds_Makefile_in
+++ b/textproc/scrollkeeper/patches/patch-extract_dtds_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-extract_dtds_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- extract/dtds/Makefile.in.orig	Sun Sep  8 16:53:19 2002
+++ extract/dtds/Makefile.in	Sun Sep  8 17:00:14 2002
+@@ -282,9 +282,6 @@ install-data-hook:
+ 	#
+ 
+ 	# ScrollKeeper OMF Variation DTD V1.0
+-	-/usr/bin/xmlcatalog --noout --add "public" \
+-		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+-		"$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
+ 
+ uninstall-local:
+ 	#
--- a/textproc/scrollkeeper/patches/patch-extract_src_Makefile_in
+++ b/textproc/scrollkeeper/patches/patch-extract_src_Makefile_in
@ -0,0 +1,20 @@
+$OpenBSD: patch-extract_src_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- extract/src/Makefile.in.orig	Wed Jul 24 19:27:41 2002
+++ extract/src/Makefile.in	Sat Sep  7 18:26:19 2002
+@@ -136,6 +136,7 @@ INCLUDES = \
+ LDADD = \
+         $(XML_LIBS) \
+         $(XSLT_LIBS) \
+        $(INTLLIBS) \
+         $(top_builddir)/libs/libscrollkeeper.la
+ 
+ 
+@@ -153,7 +154,7 @@ PROGRAMS =  $(bin_PROGRAMS)
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L$(top_builddir)/libs/.libs @LDFLAGS@
+ LIBS = @LIBS@
+ scrollkeeper_extract_OBJECTS =  scrollkeeper-extract.$(OBJEXT)
+ scrollkeeper_extract_LDADD = $(LDADD)
--- a/textproc/scrollkeeper/patches/patch-libs_Makefile_in
+++ b/textproc/scrollkeeper/patches/patch-libs_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-libs_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- libs/Makefile.in.orig	Sat Jun  1 08:17:00 2002
+++ libs/Makefile.in	Wed Jul 24 12:30:40 2002
+@@ -259,7 +259,7 @@ distclean-libtool:
+ maintainer-clean-libtool:
+ 
+ libscrollkeeper.la: $(libscrollkeeper_la_OBJECTS) $(libscrollkeeper_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libscrollkeeper_la_LDFLAGS) $(libscrollkeeper_la_OBJECTS) $(libscrollkeeper_la_LIBADD) $(LIBS)
+	$(LINK) -version-info 1:0 -rpath $(libdir) $(libscrollkeeper_la_LDFLAGS) $(libscrollkeeper_la_OBJECTS) $(libscrollkeeper_la_LIBADD) $(LIBS)
+ 
+ tags: TAGS
+ 
--- a/textproc/scrollkeeper/patches/patch-libs_database_c
+++ b/textproc/scrollkeeper/patches/patch-libs_database_c
@ -0,0 +1,13 @@
+$OpenBSD: patch-libs_database_c,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- libs/database.c.orig	Tue Sep 10 11:53:51 2002
+++ libs/database.c	Tue Sep 10 11:56:45 2002
+@@ -131,7 +131,8 @@ int create_database_directory(char *scro
+     
+     /* create locale directories and symlinks */
+     
+-    dir = opendir(data_dir);
+    if ((dir = opendir(data_dir)) == NULL)
+       return;
+     
+     while((dir_ent = readdir(dir)) != NULL)
+     {
--- a/textproc/scrollkeeper/patches/patch-ltconfig
+++ b/textproc/scrollkeeper/patches/patch-ltconfig
@ -1,81 +0,0 @@
-$OpenBSD: patch-ltconfig,v 1.3 2001/09/18 17:27:44 naddy Exp $
--- ltconfig.orig	Wed Mar 28 14:00:03 2001
-+++ ltconfig	Tue Sep 18 19:17:21 2001
-@@ -501,7 +501,14 @@ fi
- 
- if test -n "$RANLIB"; then
-   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+  case "$host_os" in 
-+  openbsd*) 
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+  ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+  ;;
-+  esac
- fi
- 
- # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
-@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
-     with_gnu_ld=no
-   fi
-   ;;
-
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- esac
- 
- ld_shlibs=yes
-@@ -1402,10 +1411,21 @@ else
-     ;;
- 
-   openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-+    case "$host_os" in
-+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
-+      *)
-+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  export_dynamic_flag_spec='${wl}-E'
-+	fi
-+      ;;
-+    esac
-     ;;
- 
-   os2*)
-@@ -2021,9 +2041,23 @@ netbsd*)
- 
- openbsd*)
-   version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
-+  need_lib_prefix=no
-+  need_version=no
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    case "$host_os" in
-+    openbsd2.[89] | openbsd2.[89].*)
-+      shlibpath_overrides_runpath=no
-+    ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+    ;;
-+    esac
-+  else
-+    deplibs_check_method='file_magic OpenBSD.* shared library'
-+    shlibpath_overrides_runpath=yes
-   fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--- a/textproc/scrollkeeper/patches/patch-ltmain_sh
+++ b/textproc/scrollkeeper/patches/patch-ltmain_sh
@ -1,48 +1,27 @@
-$OpenBSD: patch-ltmain.sh,v 1.3 2001/09/18 17:27:44 naddy Exp $
--- ltmain.sh.orig	Wed Mar 28 14:00:03 2001
-+++ ltmain.sh	Tue Sep 18 19:17:25 2001
-@@ -1079,6 +1079,17 @@ compiler."
- 	    # These systems don't actually have c library (as such)
- 	    continue
- 	    ;;
-+	  *-*-openbsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    continue
-+	    ;;
-+	  esac
-+	elif test "$arg" = "-lc_r"; then
-+	  case "$host" in
-+	  *-*-openbsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
- 	  esac
- 	elif test "$arg" = "-lm"; then
- 	  case "$host" in
-@@ -1091,6 +1102,10 @@ compiler."
- 	deplibs="$deplibs $arg"
+$OpenBSD: patch-ltmain_sh,v 1.1 2002/11/30 04:41:29 marcm Exp $
+--- ltmain.sh.orig	Sat Jun  1 08:15:26 2002
+++ ltmain.sh	Wed Jul 24 11:41:49 2002
+@@ -1037,6 +1037,17 @@ compiler."
+ 	continue
 	;;
 
-+      -?thread)
-+	deplibs="$deplibs $arg"
+      -pthread)
+	case $host in
+	*-*-openbsd*)
+	  deplibs="$deplibs $arg"
+	  ;;
+	*)
+	  continue
+	  ;;
+	esac
 +	;;
 +
       -module)
 	module=yes
 	continue
-@@ -1795,6 +1810,9 @@ compiler."
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
- 	  ;;
-+	*-*-openbsd*)
-+	  # Do not include libc due to us having libc/libc_r.
-+	  ;;
-         *-*-rhapsody*)
- 	  # rhapsody is a little odd...
- 	  deplibs="$deplibs -framework System"
-@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
+@@ -4412,40 +4423,6 @@ relink_command=\"$relink_command\""
     # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
+     test "$show" = ":" && exit 0
 
 -    echo "----------------------------------------------------------------------"
 -    echo "Libraries have been installed in:"
@ -52,7 +31,7 @@ $OpenBSD: patch-ltmain.sh,v 1.3 2001/09/18 17:27:44 naddy Exp $
 -    echo
 -    echo "If you ever happen to want to link against installed libraries"
 -    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
 -    echo "flag during linking and do at least one of the following:"
 -    if test -n "$shlibpath_var"; then
 -      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--- a/textproc/scrollkeeper/pkg/DEINSTALL
+++ b/textproc/scrollkeeper/pkg/DEINSTALL
@ -1,15 +1,32 @@
-#! /bin/sh
+#!/bin/sh
+#
+# $OpenBSD: DEINSTALL,v 1.2 2002/11/30 04:41:29 marcm Exp $
+#

 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin

+FILES='
+scrollkeeper.conf
+'
+
 echo
-echo "+---------------"
-echo "| If you don't have any local applications that uses scrollkeeper"
-echo "| you should now perform the following step as root:"
+echo "+--------------- $1"
+echo "| To really remove $1 from your system you should also"
+echo "| remove the configuration files from the ${SYSCONFDIR} directory"
+echo "| and perform the following step as root:"
 echo "|"
-echo "| rm -rf /var/lib/scrollkeeper"
-echo "+---------------"
+echo "| rm -rf /var/db/scrollkeeper"
+echo "|"
+echo "| If you are planning on installing $1 again in the future"
+echo "| you can leave it as it is."
+echo "|"
+echo "| FYI, the following configuration files belong to this package:"
+echo "|"
+for f in ${FILES}; do
+	echo "| ${SYSCONFDIR}/$f"
+done
+echo "+--------------- $1"
 echo

 exit 0
--- a/textproc/scrollkeeper/pkg/INSTALL
+++ b/textproc/scrollkeeper/pkg/INSTALL
@ -1,28 +1,98 @@
 #!/bin/sh
 #
-# $OpenBSD: INSTALL,v 1.1.1.1 2001/09/13 20:40:56 todd Exp $
-#
+# $OpenBSD: INSTALL,v 1.2 2002/11/30 04:41:29 marcm Exp $
+
+P_NAME=scrollkeeper
+
+DIRS='
+'
+
+FILES='
+scrollkeeper.conf
+'
+
+set -e
+PREFIX=${PKG_PREFIX:-/usr/local}
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+do_post() {
+
+	DEST_PFX=${SYSCONFDIR}
+	SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
+
+	echo 
+	echo "+--------------- ${P_NAME}"
+
+	# install dirs if neccessary
+	for d in ${DIRS}; do
+		if [ ! -d "${DEST_PFX}/$d" ]; then
+			install -d ${DEST_PFX}/$d
+		fi
+	done
+	install -d /var/db/scrollkeeper
+
+	# install or take note of existing config files
+	for f in ${FILES}; do
+		if [ -f "${DEST_PFX}/$f" ]; then
+			OLD_CONFS="${OLD_CONFS} $f"
+		else
+			if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then
+				echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
+				exit 1
+			fi
+			NEW_CONFS="${NEW_CONFS} $f"
+		fi
+	done
+
+	# print status report
+	if [ -n "${NEW_CONFS}" ]; then
+		echo "| The following NEW configuration files have been installed:"
+		echo "|"
+		for f in ${NEW_CONFS}; do
+			echo "| ${DEST_PFX}/$f"
+		done 
+	fi
+	
+	if [ -n "${OLD_CONFS}" ]; then
+		if [ -n "${NEW_CONFS}" ]; then
+			echo "|"
+		fi
+		echo "| The following OLD configuration files were found and have NOT been"
+		echo "| overwritten:"
+		echo "|"
+		for f in ${OLD_CONFS}; do
+			echo "| ${DEST_PFX}/$f"
+		done
+		echo "|"
+		echo "| You should however manually compare them to their equivalents in"
+		echo "|"
+		echo "| ${SOURCE_PFX}"
+		echo "|"
+		echo "| and update your configuration as needed." 
+	fi
+	echo "+--------------- ${P_NAME}"
+	echo 
+}

 # verify proper execution
 #
 if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
 fi

 # Verify/process the command
 #
 case $2 in
-    PRE-INSTALL)
-        ;;
-    POST-INSTALL)
-	# localstatedir
-        install -d /var/lib/scrollkeeper
-        ;;
-    *)
-        echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-        exit 1
-        ;;
+	PRE-INSTALL)
+		;;
+	POST-INSTALL)
+		do_post
+		;;
+	*)
+		echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+		exit 1
+		;;
 esac

 exit 0
--- a/textproc/scrollkeeper/pkg/PFRAG.shared
+++ b/textproc/scrollkeeper/pkg/PFRAG.shared
@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/09/13 20:40:56 todd Exp $
-lib/libscrollkeeper.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2002/11/30 04:41:29 marcm Exp $
+lib/libscrollkeeper.so.1.0
 DYNLIBDIR(%D/lib)
--- a/textproc/scrollkeeper/pkg/PLIST
+++ b/textproc/scrollkeeper/pkg/PLIST
@ -1,8 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/08/10 11:41:27 nino Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/11/30 04:41:29 marcm Exp $
 bin/scrollkeeper-config
+bin/scrollkeeper-extract
+bin/scrollkeeper-gen-seriesid
 bin/scrollkeeper-get-cl
 bin/scrollkeeper-get-content-list
 bin/scrollkeeper-get-extended-content-list
+bin/scrollkeeper-get-index-from-docpath
 bin/scrollkeeper-get-toc-from-docpath
 bin/scrollkeeper-get-toc-from-id
 bin/scrollkeeper-install
@ -10,24 +13,32 @@ bin/scrollkeeper-preinstall
 bin/scrollkeeper-rebuilddb
 bin/scrollkeeper-uninstall
 bin/scrollkeeper-update
-bin/scrollkeeper_toc
 lib/libscrollkeeper.a
 lib/libscrollkeeper.la
-man/man8/scrollkeeper-config.8
+man/man1/scrollkeeper-config.1
+man/man1/scrollkeeper-gen-seriesid.1
+man/man5/scrollkeeper.conf.5
+man/man7/scrollkeeper.7
 man/man8/scrollkeeper-preinstall.8
 man/man8/scrollkeeper-rebuilddb.8
 man/man8/scrollkeeper-update.8
-share/doc/scrollkeeper-0.2/COPYING-DOCS
+@comment share/doc/scrollkeeper-0.3.11/COPYING-DOCS
+share/examples/scrollkeeper/scrollkeeper.conf
+share/locale/az/LC_MESSAGES/scrollkeeper.mo
+share/locale/ca/LC_MESSAGES/scrollkeeper.mo
 share/locale/da/LC_MESSAGES/scrollkeeper.mo
 share/locale/de/LC_MESSAGES/scrollkeeper.mo
 share/locale/el/LC_MESSAGES/scrollkeeper.mo
 share/locale/es/LC_MESSAGES/scrollkeeper.mo
 share/locale/fr/LC_MESSAGES/scrollkeeper.mo
 share/locale/hu/LC_MESSAGES/scrollkeeper.mo
+share/locale/it/LC_MESSAGES/scrollkeeper.mo
 share/locale/ja/LC_MESSAGES/scrollkeeper.mo
 share/locale/ko/LC_MESSAGES/scrollkeeper.mo
+share/locale/nb/LC_MESSAGES/scrollkeeper.mo
 share/locale/nl/LC_MESSAGES/scrollkeeper.mo
 share/locale/no/LC_MESSAGES/scrollkeeper.mo
+share/locale/pl/LC_MESSAGES/scrollkeeper.mo
 share/locale/pt_BR/LC_MESSAGES/scrollkeeper.mo
 share/locale/ru/LC_MESSAGES/scrollkeeper.mo
 share/locale/sk/LC_MESSAGES/scrollkeeper.mo
@ -35,214 +46,128 @@ share/locale/sl/LC_MESSAGES/scrollkeeper.mo
 share/locale/sv/LC_MESSAGES/scrollkeeper.mo
 share/locale/tr/LC_MESSAGES/scrollkeeper.mo
 share/locale/uk/LC_MESSAGES/scrollkeeper.mo
-share/omf/scrollkeeper/scrollkeeper_manual-C.omf
+share/locale/vi/LC_MESSAGES/scrollkeeper.mo
+share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
+share/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
 share/scrollkeeper/Templates/C/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/af/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/ar/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/az/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/bg/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/bg_BG
-share/scrollkeeper/Templates/bg_BG.cp1251
-share/scrollkeeper/Templates/bo/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/br/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/bs/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/cy/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/da/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/de/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/de_AT
 share/scrollkeeper/Templates/el/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/en
-share/scrollkeeper/Templates/en_AU
-share/scrollkeeper/Templates/en_GB
-share/scrollkeeper/Templates/en_SE
-share/scrollkeeper/Templates/en_UK
-share/scrollkeeper/Templates/en_US
-share/scrollkeeper/Templates/eo/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/es/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/es_DO
-share/scrollkeeper/Templates/es_ES
-share/scrollkeeper/Templates/es_GT
-share/scrollkeeper/Templates/es_HN
-share/scrollkeeper/Templates/es_MX
-share/scrollkeeper/Templates/es_PA
-share/scrollkeeper/Templates/es_PE
-share/scrollkeeper/Templates/es_SV
-share/scrollkeeper/Templates/et/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/eu/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/fi/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/ga/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/gd/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/gl/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/gu/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/gv/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/he/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/hi/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/hr/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/hs/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/id/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/is/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/it/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/ja_JP.eucJP
-share/scrollkeeper/Templates/km/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/kw/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/li/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/lt/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/mi/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/mk/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/mr/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/nb/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/nn/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/no
-share/scrollkeeper/Templates/no_NY
-share/scrollkeeper/Templates/oc/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/no/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/pt/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/pt_PT
-share/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/se/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/sp/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/sr_YU
 share/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/sv_SE
-share/scrollkeeper/Templates/ta/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/th/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/wa/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/zh/scrollkeeper_cl.xml
-share/scrollkeeper/Templates/zh_CN
-share/scrollkeeper/Templates/zh_CN.GB2312
-share/scrollkeeper/Templates/zh_TW
-share/scrollkeeper/Templates/zh_TW.Big5
-share/scrollkeeper/doc/scrollkeeper_manual/C/aboutthisdoc.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/administration.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/authors.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/contents-tree.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/docbook.css
-share/scrollkeeper/doc/scrollkeeper_manual/C/exampleomffiles.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/fdl.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/glossary.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/index.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/indexapi.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/installbyhand.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/installingdocsandomf.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/intro.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/ln15.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/makingthingseasier.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/packaging.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/packagingdeb.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/packagingrpm.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/postinstallationscript.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeper-contents-list.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeper-docs.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeper_manual.sgml
-share/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeperapi.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeperfiles.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeperlicense.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/caution.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/home.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/important.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/next.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/note.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/prev.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/tip.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/toc-blank.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/toc-minus.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/toc-plus.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/up.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/warning.gif
-share/scrollkeeper/doc/scrollkeeper_manual/C/tableofcontentsapi.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/theomf.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/theomfspecification.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/toc-file.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/uninstallbyhand.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/uninstalling.html
-share/scrollkeeper/doc/scrollkeeper_manual/C/writingomffiles.html
+share/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
+share/scrollkeeper/stylesheets/categories.xsl
+share/scrollkeeper/stylesheets/index.xsl
+share/scrollkeeper/stylesheets/toc.xsl
+share/xml/catalog.scrollkeeper
+share/xml/docbook.scrollkeeper
+share/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
+share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
 %%SHARED%%
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images
-@exec mkdir -p %D/share/scrollkeeper/doc/scrollkeeper_manual/C/figures
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual/C/figures
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual/C
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual
+@dirrm share/xml/scrollkeeper/dtds
+@dirrm share/xml/scrollkeeper
+@comment @dirrm share/xml
+@dirrm share/scrollkeeper/stylesheets
+@dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
+@dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files
@dirrm share/scrollkeeper/doc
-@dirrm share/scrollkeeper/Templates/zh
-@dirrm share/scrollkeeper/Templates/wa
-@dirrm share/scrollkeeper/Templates/uk
+@dirrm share/scrollkeeper/Templates/zh_TW
+@dirrm share/scrollkeeper/Templates/vi
+@comment @exec mkdir -p %D/share/scrollkeeper/Templates/uk
+@comment @dirrm share/scrollkeeper/Templates/uk
@dirrm share/scrollkeeper/Templates/tr
-@dirrm share/scrollkeeper/Templates/th
-@dirrm share/scrollkeeper/Templates/ta
@dirrm share/scrollkeeper/Templates/sv
-@dirrm share/scrollkeeper/Templates/sr
-@dirrm share/scrollkeeper/Templates/sp
@dirrm share/scrollkeeper/Templates/sl
@dirrm share/scrollkeeper/Templates/sk
-@dirrm share/scrollkeeper/Templates/se
@dirrm share/scrollkeeper/Templates/ru
-@dirrm share/scrollkeeper/Templates/ro
@dirrm share/scrollkeeper/Templates/pt_BR
-@dirrm share/scrollkeeper/Templates/pt
@dirrm share/scrollkeeper/Templates/pl
-@dirrm share/scrollkeeper/Templates/oc
-@dirrm share/scrollkeeper/Templates/nn
+@dirrm share/scrollkeeper/Templates/no
@dirrm share/scrollkeeper/Templates/nl
@dirrm share/scrollkeeper/Templates/nb
-@dirrm share/scrollkeeper/Templates/mr
-@dirrm share/scrollkeeper/Templates/mk
-@dirrm share/scrollkeeper/Templates/mi
-@dirrm share/scrollkeeper/Templates/lt
-@dirrm share/scrollkeeper/Templates/li
-@dirrm share/scrollkeeper/Templates/kw
@dirrm share/scrollkeeper/Templates/ko
-@dirrm share/scrollkeeper/Templates/km
@dirrm share/scrollkeeper/Templates/ja
@dirrm share/scrollkeeper/Templates/it
-@dirrm share/scrollkeeper/Templates/is
-@dirrm share/scrollkeeper/Templates/id
@dirrm share/scrollkeeper/Templates/hu
-@dirrm share/scrollkeeper/Templates/hs
-@dirrm share/scrollkeeper/Templates/hr
-@dirrm share/scrollkeeper/Templates/hi
-@dirrm share/scrollkeeper/Templates/he
-@dirrm share/scrollkeeper/Templates/gv
-@dirrm share/scrollkeeper/Templates/gu
-@dirrm share/scrollkeeper/Templates/gl
-@dirrm share/scrollkeeper/Templates/gd
-@dirrm share/scrollkeeper/Templates/ga
-@dirrm share/scrollkeeper/Templates/fr
-@dirrm share/scrollkeeper/Templates/fi
-@dirrm share/scrollkeeper/Templates/eu
-@dirrm share/scrollkeeper/Templates/et
+@comment @exec mkdir -p %D/share/scrollkeeper/Templates/fr
+@comment @dirrm share/scrollkeeper/Templates/fr
@dirrm share/scrollkeeper/Templates/es
-@dirrm share/scrollkeeper/Templates/eo
@dirrm share/scrollkeeper/Templates/el
@dirrm share/scrollkeeper/Templates/de
@dirrm share/scrollkeeper/Templates/da
-@dirrm share/scrollkeeper/Templates/cy
-@dirrm share/scrollkeeper/Templates/cs
@dirrm share/scrollkeeper/Templates/ca
-@dirrm share/scrollkeeper/Templates/bs
-@dirrm share/scrollkeeper/Templates/br
-@dirrm share/scrollkeeper/Templates/bo
-@dirrm share/scrollkeeper/Templates/bg
-@dirrm share/scrollkeeper/Templates/az
-@dirrm share/scrollkeeper/Templates/ar
-@dirrm share/scrollkeeper/Templates/af
@dirrm share/scrollkeeper/Templates/C
@dirrm share/scrollkeeper/Templates
@dirrm share/scrollkeeper
@dirrm share/omf/scrollkeeper
-@unexec rmdir %D/share/omf || true
-@dirrm share/doc/scrollkeeper-0.2
-@exec %D/bin/scrollkeeper-update -p $(%D/bin/scrollkeeper-config --pkglocalstatedir)
+@dirrm share/omf
+@comment @dirrm share/locale/zh_TW/LC_MESSAGES
+@comment @dirrm share/locale/zh_TW
+@comment @dirrm share/locale/vi/LC_MESSAGES
+@comment @dirrm share/locale/vi
+@comment @dirrm share/locale/uk/LC_MESSAGES
+@comment @dirrm share/locale/uk
+@comment @dirrm share/locale/tr/LC_MESSAGES
+@comment @dirrm share/locale/tr
+@comment @dirrm share/locale/sv/LC_MESSAGES
+@comment @dirrm share/locale/sv
+@comment @dirrm share/locale/sl/LC_MESSAGES
+@comment @dirrm share/locale/sl
+@comment @dirrm share/locale/sk/LC_MESSAGES
+@comment @dirrm share/locale/sk
+@comment @dirrm share/locale/ru/LC_MESSAGES
+@comment @dirrm share/locale/ru
+@comment @dirrm share/locale/pt_BR/LC_MESSAGES
+@comment @dirrm share/locale/pt_BR
+@comment @dirrm share/locale/pl/LC_MESSAGES
+@comment @dirrm share/locale/pl
+@comment @dirrm share/locale/no/LC_MESSAGES
+@comment @dirrm share/locale/no
+@comment @dirrm share/locale/nl/LC_MESSAGES
+@comment @dirrm share/locale/nl
+@comment @dirrm share/locale/nb/LC_MESSAGES
+@comment @dirrm share/locale/nb
+@comment @dirrm share/locale/ko/LC_MESSAGES
+@comment @dirrm share/locale/ko
+@comment @dirrm share/locale/ja/LC_MESSAGES
+@comment @dirrm share/locale/ja
+@comment @dirrm share/locale/it/LC_MESSAGES
+@comment @dirrm share/locale/it
+@comment @dirrm share/locale/hu/LC_MESSAGES
+@comment @dirrm share/locale/hu
+@comment @dirrm share/locale/fr/LC_MESSAGES
+@comment @dirrm share/locale/fr
+@comment @dirrm share/locale/es/LC_MESSAGES
+@comment @dirrm share/locale/es
+@comment @dirrm share/locale/el/LC_MESSAGES
+@comment @dirrm share/locale/el
+@comment @dirrm share/locale/de/LC_MESSAGES
+@comment @dirrm share/locale/de
+@comment @dirrm share/locale/da/LC_MESSAGES
+@comment @dirrm share/locale/da
+@comment @dirrm share/locale/ca/LC_MESSAGES
+@comment @dirrm share/locale/ca
+@comment @dirrm share/locale/az/LC_MESSAGES
+@comment @dirrm share/locale/az
+@comment @dirrm share/locale
+@dirrm share/examples/scrollkeeper
+@comment @dirrm share/doc/scrollkeeper-0.3.11
+@exec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-rebuilddb -q
+@exec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-update -q