Update to 0.3.9.

Approved by:	silence from the GNOME user group

textproc/scrollkeeper/Makefile

@@ -6,39 +6,65 @@
 #
 
 PORTNAME=	scrollkeeper
-PORTVERSION=	0.2
+PORTVERSION=	0.3.9
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_GNOME}
-		${MASTER_SITE_GNOME:S,%SUBDIR%,stable/sources/scrollkeeper,}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
-MASTER_SITE_SUBDIR=	${PORTNAME}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
+LIB_DEPENDS=	xslt.1:${PORTSDIR}/textproc/libxslt \
 		intl.2:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
 
 # Don't use USE_X_PREFIX - the port doesn't really require X11 to run.
 # The reason why it should be in X11BASE is that GNOME is the primary
 # (only?) consumer of this port, and BadThings[tm] happen if it's not
 # put in the right place.
-PREFIX?=        ${X11BASE}
+PREFIX?=	${X11BASE}
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share/gnome \
+		--with-omfdirs=${PREFIX}/share/gnome/omf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+		LIBS="-L${LOCALBASE}/lib -lintl" \
+		LOCALBASE="${LOCALBASE}"
+PLIST_SUB=	LOCALBASE=${LOCALBASE}
 
-MAN8=		scrollkeeper-config.8 scrollkeeper-preinstall.8 \
+MAN1=	scrollkeeper-config.1 scrollkeeper-gen-seriesid.1
-		scrollkeeper-rebuilddb.8 scrollkeeper-update.8
+MAN5=	scrollkeeper.conf.5
+MAN7=	scrollkeeper.7
+MAN8=	scrollkeeper-preinstall.8 scrollkeeper-rebuilddb.8 \
+	scrollkeeper-update.8
 
 pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e   \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		's|\$$\(LN_S\) -f -n|\$$\(LN_S\) -f|g'
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e   \
+		's|[(]LN_S[)] -f -n|(LN_S) -f|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
+		 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+	@${REINPLACE_CMD} -e 's|/usr/share/locale|${PREFIX}/share/locale|g' \
+		${WRKSRC}/libs/scrollkeeper.h.in
+post-patch:
+	@${REINPLACE_CMD} -e 's|[%][%]PREFIX[%][%]|${PREFIX}|g' \
+		${WRKSRC}/cl/src/update.c
+	@${REINPLACE_CMD} -e 's|[%][%]LOCALBASE[%][%]|${LOCALBASE}|g' \
+		${WRKSRC}/extract/dtds/Makefile.in
 
-post-install:
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	@${MKDIR} ${PREFIX}/share/gnome/scrollkeeper/TOC
+pre-install:
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.endif
 
 .include <bsd.port.mk>

textproc/scrollkeeper/distinfo

@@ -1 +1 @@
-MD5 (scrollkeeper-0.2.tar.gz) = a10cb1fae040525e50b1b05dc06dc9a7
+MD5 (gnome2/scrollkeeper-0.3.9.tar.bz2) = 9f23d9d7ec2a5cf0bc0cc162f0090b3f

textproc/scrollkeeper/files/patch-Makefile.in

@@ -1,21 +1,27 @@
---- Makefile.in.orig	Wed Mar 28 06:22:13 2001
+--- Makefile.in.orig	Sat May 25 22:59:08 2002
-+++ Makefile.in	Tue Apr  3 11:13:37 2001
++++ Makefile.in	Sat May 25 23:09:40 2002
-@@ -108,4 +108,2 @@
+@@ -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 = 
++DATA =
  
-@@ -353,3 +351,3 @@
+ DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
- 
+ INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
--install-data-am: install-scrollkeeperdocDATA
+@@ -393,7 +391,6 @@
-+install-data-am:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- install-data: install-data-recursive
+ installdirs: installdirs-recursive
-@@ -367,3 +365,2 @@
  installdirs-am:
 -	$(mkinstalldirs)  $(DESTDIR)$(scrollkeeperdocdir)
  
+ 
+ mostlyclean-generic:

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")) {

textproc/scrollkeeper/files/patch-cl::src::install.c

@@ -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;
-     

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;
+     }
+             

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;
+ 	}

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 = 

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].*)

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)
+ 

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)
+     {

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
+ 
+ /*

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.orig	Thu Mar 21 00:08:51 2002
-+++ scripts/scrollkeeper-config.in	Sun May 26 16:19:13 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@

textproc/scrollkeeper/files/patch-toc_src_toc-extract.c

@@ -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)
- 	{

textproc/scrollkeeper/pkg-install

@@ -0,0 +1,261 @@
+#!/bin/sh
+
+if [ -n "${PACKAGE_BUILDING}" ]; then
+    exit 0
+fi
+
+PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+export PATH
+
+PREFIX=`xml2-config --prefix`
+ROOTCATALOG=${PREFIX}/share/xml/catalog
+CATALOG=${PREFIX}/share/xml/docbook/catalog
+
+if [ "$2" = "PRE-INSTALL" ]; then
+if [ -r $ROOTCATALOG ] ; then
+   echo backing up XML Catalog root $ROOTCATALOG
+   cp -f $ROOTCATALOG ${ROOTCATALOG}.bak
+   rm -f $ROOTCATALOG
+fi
+
+if [ -r $CATALOG ] ; then
+   echo backing up XML Catalog $CATALOG
+   cp -f $CATALOG ${CATALOG}.bak
+   rm -f $CATALOG
+fi
+
+#
+# create the catalogs root and docbook specific
+#
+if [ ! -r $ROOTCATALOG ] ; then
+   echo creating XML Catalog root $ROOTCATALOG
+   xmlcatalog --noout --create $ROOTCATALOG
+fi
+if [ ! -r $ROOTCATALOG ] ; then
+   echo Failed creating XML Catalog root $ROOTCATALOG
+   exit 1
+fi
+if [ ! -r $CATALOG ] ; then
+   echo creating DocBook XML Catalog $CATALOG
+   xmlcatalog --noout --create $CATALOG
+fi
+if [ ! -r $CATALOG ] ; then
+   echo Failed creating DocBook XML Catalog $CATALOG
+   exit 1
+fi
+
+#
+# find the prefix for DocBook DTD
+#
+found=`find ${PREFIX} -name docbookx.dtd 2> /dev/null`
+if [ "$found" = "" ] ; then
+    echo could not locate docbookx.dtd for DocBook XML
+    exit 1
+fi
+
+dtd421=""
+for dtd in $found; do
+    check=`grep '//OASIS//DTD DocBook XML V4.1.2//EN' $dtd`
+    if [ "$check" != "" ] ; then
+        dtd421=$dtd
+        break
+    fi
+done
+
+if [ "$dtd421" = "" ] ; then
+    echo could not locate version 4.1.2 of DocBook XML
+    exit 1
+fi
+
+docbookdir=`dirname $dtd421`
+echo Found DocBook XML 4.1.2 DTD in $docbookdir
+
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
+    "file://$docbookdir/dbpoolx.mod" $CATALOG
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
+    "file://$docbookdir/docbookx.dtd" $CATALOG
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
+    "file://$docbookdir/dbcentx.mod" $CATALOG
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
+    "file://$docbookdir/dbnotnx.mod" $CATALOG
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
+    "file://$docbookdir/dbgenent.mod" $CATALOG
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
+    "file://$docbookdir/dbhierx.mod" $CATALOG
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+    "file://$docbookdir/soextblx.dtd" $CATALOG
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
+    "file://$docbookdir/calstblx.dtd" $CATALOG
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/4.1.2" \
+    "file://$docbookdir" $CATALOG
+xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/4.1.2" \
+    "file://$docbookdir" $CATALOG
+
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file://$CATALOG" $ROOTCATALOG
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file://$CATALOG" $ROOTCATALOG
+xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file://$CATALOG" $ROOTCATALOG
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file://$CATALOG" $ROOTCATALOG
+
+#
+# find the prefix for ISO DocBook entities
+#
+top=`dirname $docbookdir`
+found=`find $top -iname "iso*amsb.ent" 2> /dev/null`
+found=`find ${PREFIX} -iname "iso*amsb.ent" 2> /dev/null`
+if [ "$found" = "" ] ; then
+    echo could not locate iso-amsb.ent of ISO DocBook entities
+    exit 1
+fi
+
+entxml=""
+for tst in $found; do
+    check=`grep '<!ENTITY ominus."\&#x2296;">' $tst`
+    if [ "$check" != "" ] ; then
+        entxml=$tst
+        break
+    fi
+done
+
+if [ "$entxml" = "" ] ; then
+    echo could not locate ISO DocBook entities
+    exit 1
+fi
+isodir=`dirname $entxml`
+echo Found ISO DocBook entities in $isodir
+
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Publishing//EN" \
+    "file://$isodir/iso-pub.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Greek Letters//EN" \
+    "file://$isodir/iso-grk1.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
+    "file://$isodir/iso-box.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
+    "file://$isodir/iso-grk3.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
+    "file://$isodir/iso-amsn.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
+    "file://$isodir/iso-num.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
+    "file://$isodir/iso-grk4.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
+    "file://$isodir/iso-dia.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
+    "file://$isodir/iso-grk2.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
+    "file://$isodir/iso-amsa.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
+    "file://$isodir/iso-amso.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
+    "file://$isodir/iso-cyr1.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES General Technical//EN" \
+    "file://$isodir/iso-tech.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
+    "file://$isodir/iso-amsc.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
+    "file://$isodir/iso-lat1.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
+    "file://$isodir/iso-amsb.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
+    "file://$isodir/iso-lat2.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
+    "file://$isodir/iso-amsr.ent" $CATALOG
+xmlcatalog --noout --add "public" \
+    "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
+    "file://$isodir/iso-cyr2.ent" $CATALOG
+
+xmlcatalog --noout --add "delegatePublic" \
+    "ISO 8879:1986" \
+    "file://$CATALOG" $ROOTCATALOG
+
+#
+# find the prefix for XSLT stylesheets
+#
+top=`dirname $docbookdir`
+found=`find $top -name chunk.xsl 2> /dev/null`
+found=`find ${PREFIX} -name chunk.xsl 2> /dev/null`
+if [ "$found" = "" ] ; then
+    echo could not locate chunk-common.xsl of DocBook XSLT stylesheets
+    exit 1
+fi
+
+xsldir=""
+for tst in $found; do
+    dir=`dirname $tst`
+    dir=`dirname $dir`
+    if [ -r $dir/html/docbook.xsl -a -r $dir/common/l10n.xml ]; then
+        xsldir=$dir
+        break
+    fi
+done
+
+if [ "$xsldir" = "" ] ; then
+    echo could not locate DocBook XSLT stylesheets
+    exit 1
+fi
+echo Found DocBook XSLT stylesheets in $xsldir
+for version in current 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \
+               1.48 1.49 1.50
+do
+    xmlcatalog --noout --add "rewriteSystem" \
+	"http://docbook.sourceforge.net/release/xsl/$version" \
+	"file://$xsldir" $CATALOG
+    xmlcatalog --noout --add "rewriteURI" \
+	"http://docbook.sourceforge.net/release/xsl/$version" \
+	"file://$xsldir" $CATALOG
+done
+
+xmlcatalog --noout --add "delegateSystem" \
+    "http://docbook.sourceforge.net/release/xsl/" \
+    "file://$CATALOG" $ROOTCATALOG
+xmlcatalog --noout --add "delegateURI" \
+    "http://docbook.sourceforge.net/release/xsl/" \
+    "file://$CATALOG" $ROOTCATALOG
+fi
+
+if [ "$2" = "POST-INSTALL" ]; then
+    SKPREFIX=`scrollkeeper-config --prefix`
+    echo "`date +"%b %d %X"` Installing ScrollKeeper `scrollkeeper-config --version`..." >> /var/log/scrollkeeper.log
+
+    xmlcatalog --noout --add "public" \
+    	"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+	"${SKPREFIX}/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
+	${PREFIX}/share/xml/catalog
+
+    scrollkeeper-rebuilddb -q -p /var/db/scrollkeeper || /usr/bin/true
+fi

textproc/scrollkeeper/pkg-plist

@@ -1,7 +1,10 @@
 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
@@ -9,129 +12,50 @@ bin/scrollkeeper-preinstall
 bin/scrollkeeper-rebuilddb
 bin/scrollkeeper-uninstall
 bin/scrollkeeper-update
-bin/scrollkeeper_toc
+etc/scrollkeeper.conf
 lib/libscrollkeeper.a
 lib/libscrollkeeper.so
 lib/libscrollkeeper.so.0
-share/gnome/omf/scrollkeeper/scrollkeeper_manual-C.omf
+share/gnome/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
 share/gnome/scrollkeeper/Templates/C/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/af/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ar/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/az/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/bg/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/bo/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/br/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/bs/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/cy/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/da/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/de/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/el/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/eo/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/es/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/et/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/eu/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/fi/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ga/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/gd/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/gl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/gu/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/gv/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/he/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/hi/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/hr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/hs/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/id/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/is/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/it/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/km/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/kw/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/li/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/lt/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/mi/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/mk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/mr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/nb/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/nn/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/Templates/no/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/oc/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pt/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/se/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sp/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ta/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/th/scrollkeeper_cl.xml
 share/gnome/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/wa/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
-share/gnome/scrollkeeper/Templates/zh/scrollkeeper_cl.xml
+share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/aboutthisdoc.html
+share/gnome/scrollkeeper/stylesheets/categories.xsl
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/administration.html
+share/gnome/scrollkeeper/stylesheets/index.xsl
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/authors.html
+share/gnome/scrollkeeper/stylesheets/toc.xsl
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/contents-tree.html
+share/gnome/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/docbook.css
+share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/exampleomffiles.html
+share/locale/az/LC_MESSAGES/scrollkeeper.mo
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/fdl.html
+share/locale/ca/LC_MESSAGES/scrollkeeper.mo
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/glossary.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/index.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/indexapi.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/installbyhand.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/installingdocsandomf.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/intro.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/ln15.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/makingthingseasier.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/packaging.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/packagingdeb.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/packagingrpm.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/postinstallationscript.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeper-contents-list.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeper-docs.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeper-extended-contents-list.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeper_manual.sgml
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeperapi.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeperfiles.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/scrollkeeperlicense.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/caution.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/home.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/important.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/next.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/note.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/prev.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/tip.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/toc-blank.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/toc-minus.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/toc-plus.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/up.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images/warning.gif
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/tableofcontentsapi.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/theomf.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/theomfspecification.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/toc-file.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/uninstallbyhand.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/uninstalling.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/writingomffiles.html
 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
@@ -139,111 +63,42 @@ 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
-@comment These are all symlinks which have to be removed
+share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
-@comment "specially", or they will fail the pkg_delete MD5
+@dirrm share/gnome/xml/scrollkeeper/dtds
-@comment check.  Don't just sort this plist :)
+@dirrm share/gnome/xml/scrollkeeper
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/bg_BG
+@dirrm share/gnome/xml
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/bg_BG.cp1251
+@dirrm share/gnome/scrollkeeper/stylesheets
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/de_AT
+@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en
+@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en_AU
+@dirrm share/gnome/scrollkeeper/doc
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en_GB
+@dirrm share/gnome/scrollkeeper/Templates/zh_TW
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en_SE
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en_UK
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en_US
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_DO
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_ES
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_GT
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_HN
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_MX
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_PA
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_PE
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/es_SV
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/ja_JP.eucJP
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/no
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/no_NY
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/pt_PT
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/sr_YU
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/sv_SE
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/zh_CN
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/zh_CN.GB2312
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/zh_TW
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/zh_TW.Big5
-@comment Here endeth the dragons
-@dirrm share/gnome/scrollkeeper/TOC
-@dirrm share/gnome/scrollkeeper/Templates/zh
-@dirrm share/gnome/scrollkeeper/Templates/wa
 @dirrm share/gnome/scrollkeeper/Templates/uk
 @dirrm share/gnome/scrollkeeper/Templates/tr
-@dirrm share/gnome/scrollkeeper/Templates/th
-@dirrm share/gnome/scrollkeeper/Templates/ta
 @dirrm share/gnome/scrollkeeper/Templates/sv
-@dirrm share/gnome/scrollkeeper/Templates/sr
-@dirrm share/gnome/scrollkeeper/Templates/sp
 @dirrm share/gnome/scrollkeeper/Templates/sl
 @dirrm share/gnome/scrollkeeper/Templates/sk
-@dirrm share/gnome/scrollkeeper/Templates/se
 @dirrm share/gnome/scrollkeeper/Templates/ru
-@dirrm share/gnome/scrollkeeper/Templates/ro
 @dirrm share/gnome/scrollkeeper/Templates/pt_BR
-@dirrm share/gnome/scrollkeeper/Templates/pt
 @dirrm share/gnome/scrollkeeper/Templates/pl
-@dirrm share/gnome/scrollkeeper/Templates/oc
+@dirrm share/gnome/scrollkeeper/Templates/no
-@dirrm share/gnome/scrollkeeper/Templates/nn
 @dirrm share/gnome/scrollkeeper/Templates/nl
 @dirrm share/gnome/scrollkeeper/Templates/nb
-@dirrm share/gnome/scrollkeeper/Templates/mr
-@dirrm share/gnome/scrollkeeper/Templates/mk
-@dirrm share/gnome/scrollkeeper/Templates/mi
-@dirrm share/gnome/scrollkeeper/Templates/lt
-@dirrm share/gnome/scrollkeeper/Templates/li
-@dirrm share/gnome/scrollkeeper/Templates/kw
 @dirrm share/gnome/scrollkeeper/Templates/ko
-@dirrm share/gnome/scrollkeeper/Templates/km
 @dirrm share/gnome/scrollkeeper/Templates/ja
 @dirrm share/gnome/scrollkeeper/Templates/it
-@dirrm share/gnome/scrollkeeper/Templates/is
-@dirrm share/gnome/scrollkeeper/Templates/id
 @dirrm share/gnome/scrollkeeper/Templates/hu
-@dirrm share/gnome/scrollkeeper/Templates/hs
-@dirrm share/gnome/scrollkeeper/Templates/hr
-@dirrm share/gnome/scrollkeeper/Templates/hi
-@dirrm share/gnome/scrollkeeper/Templates/he
-@dirrm share/gnome/scrollkeeper/Templates/gv
-@dirrm share/gnome/scrollkeeper/Templates/gu
-@dirrm share/gnome/scrollkeeper/Templates/gl
-@dirrm share/gnome/scrollkeeper/Templates/gd
-@dirrm share/gnome/scrollkeeper/Templates/ga
 @dirrm share/gnome/scrollkeeper/Templates/fr
-@dirrm share/gnome/scrollkeeper/Templates/fi
-@dirrm share/gnome/scrollkeeper/Templates/eu
-@dirrm share/gnome/scrollkeeper/Templates/et
 @dirrm share/gnome/scrollkeeper/Templates/es
-@dirrm share/gnome/scrollkeeper/Templates/eo
 @dirrm share/gnome/scrollkeeper/Templates/el
 @dirrm share/gnome/scrollkeeper/Templates/de
 @dirrm share/gnome/scrollkeeper/Templates/da
-@dirrm share/gnome/scrollkeeper/Templates/cy
-@dirrm share/gnome/scrollkeeper/Templates/cs
 @dirrm share/gnome/scrollkeeper/Templates/ca
-@dirrm share/gnome/scrollkeeper/Templates/bs
-@dirrm share/gnome/scrollkeeper/Templates/br
-@dirrm share/gnome/scrollkeeper/Templates/bo
-@dirrm share/gnome/scrollkeeper/Templates/bg
-@dirrm share/gnome/scrollkeeper/Templates/az
-@dirrm share/gnome/scrollkeeper/Templates/ar
-@dirrm share/gnome/scrollkeeper/Templates/af
 @dirrm share/gnome/scrollkeeper/Templates/C
 @dirrm share/gnome/scrollkeeper/Templates
-@dirrm share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images
-@dirrm share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/figures
-@dirrm share/gnome/scrollkeeper/doc/scrollkeeper_manual/C
-@dirrm share/gnome/scrollkeeper/doc/scrollkeeper_manual
-@dirrm share/gnome/scrollkeeper/doc
 @dirrm share/gnome/scrollkeeper
 @dirrm share/gnome/omf/scrollkeeper
-@dirrm share/gnome/omf
+@unexec xmlcatalog --noout --del "%D/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" %%LOCALBASE%%/share/xml/catalog 2>/dev/null || true
-@dirrm share/gnome
+@unexec rm -f /var/log/scrollkeeper.log 2>/dev/null || true
 @unexec rm -rf /var/db/scrollkeeper 2>/dev/null || true
+@exec touch -f /var/log/scrollkeeper.log
 @exec mkdir -p /var/db/scrollkeeper
-@exec mkdir -p %D/share/gnome/scrollkeeper/TOC