Update to 0.3.6.

With this new version, GNOME 2.0 documentation works, and scrollkeeper
updates for GNOME 1.x applications work as well.  I have tested builds
of most of the GNOME 1.x applications, and none of them fail.

Reviewed by:	sobomax

10 files changed, 139 insertions, 210 deletions

diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 978b86b039ac..9f39959b4bba 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -6,36 +6,57 @@
 #
 
 PORTNAME=	scrollkeeper
-PORTVERSION=	0.2
-PORTREVISION=	3
+PORTVERSION=	0.3.6
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		${MASTER_SITE_GNOME:S,%SUBDIR%,stable/sources/scrollkeeper,}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xslt.1:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
+		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 
 # 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}"
 
-MAN8=		scrollkeeper-config.8 scrollkeeper-preinstall.8 \
-		scrollkeeper-rebuilddb.8 scrollkeeper-update.8
+MAN1=	scrollkeeper-config.1 scrollkeeper-gen-seriesid.1
+MAN5=	scrollkeeper.conf.5
+MAN7=	scrollkeeper.7
+MAN8=	scrollkeeper-preinstall.8 scrollkeeper-rebuilddb.8 \
+	scrollkeeper-update.8
 
 pre-patch:
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e   \
-		's|\$$\(LN_S\) -f -n|\$$\(LN_S\) -f|g'
+		'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'
+	@${PERL} -pi -e 's|/usr/share/locale|${PREFIX}/share/locale|g' \
+		${WRKSRC}/libs/scrollkeeper.h.in
+
+post-patch:
+	@${PERL} -pi -e 's|\%\%PREFIX\%\%|${PREFIX}|g' \
+		${WRKSRC}/cl/src/update.c
+	@${PERL} -pi -e 's|\%\%DATADIR\%\%|${PREFIX}/share/gnome|g' \
+		${WRKSRC}/config/scrollkeeper.conf
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/gnome/scrollkeeper/TOC
diff --git a/textproc/scrollkeeper/distinfo b/textproc/scrollkeeper/distinfo
index c5dd71a2781f..3fe5cc74f84a 100644
--- a/textproc/scrollkeeper/distinfo
+++ b/textproc/scrollkeeper/distinfo
@@ -1 +1 @@
-MD5 (scrollkeeper-0.2.tar.gz) = a10cb1fae040525e50b1b05dc06dc9a7
+MD5 (gnome2/scrollkeeper-0.3.6.tar.bz2) = 78868e23f2434c604945ae2a52b43cd3
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-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_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-config_scrollkeeper.conf b/textproc/scrollkeeper/files/patch-config_scrollkeeper.conf
new file mode 100644
index 000000000000..0febecee154b
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-config_scrollkeeper.conf
@@ -0,0 +1,5 @@
+--- config/scrollkeeper.conf.orig	Tue May 14 00:51:42 2002
++++ config/scrollkeeper.conf	Tue May 14 00:52:48 2002
+@@ -1 +1 @@
+-OMF_DIR=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/opt/gnome-2.0/share/omf:/opt/kde/omf
++OMF_DIR=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/opt/gnome-2.0/share/omf:/opt/kde/omf:%%DATADIR%%/omf
diff --git a/textproc/scrollkeeper/files/patch-configure b/textproc/scrollkeeper/files/patch-configure
new file mode 100644
index 000000000000..dbf70baf2db8
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig	Thu Mar 21 00:09:21 2002
++++ configure	Sat May 25 22:58:41 2002
+@@ -5297,6 +5297,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'
+@@ -6260,7 +6261,7 @@
+    *)
+ 	echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6
+ echo "configure:6263: 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."
+@@ -7162,7 +7163,7 @@
+     else
+             echo $ac_n "checking version of bison""... $ac_c" 1>&6
+ echo "configure:7165: 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-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-scripts_scrollkeeper-config.in b/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
new file mode 100644
index 000000000000..0185737cea7d
--- /dev/null
+++ b/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
@@ -0,0 +1,11 @@
+--- 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@
+ pkglocalstatedir=${localstatedir}/${partial_db_dir}
+-pkgdatadir=${prefix}/share/scrollkeeper
++pkgdatadir=${prefix}/share/gnome/scrollkeeper
+ datadir=@datadir@
+ 
+ usage()
diff --git a/textproc/scrollkeeper/pkg-plist b/textproc/scrollkeeper/pkg-plist
index 656661df909d..8b739ecad975 100644
--- a/textproc/scrollkeeper/pkg-plist
+++ b/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,45 @@ 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/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/wa/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/zh/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/aboutthisdoc.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/administration.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/authors.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/contents-tree.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/docbook.css
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/exampleomffiles.html
-share/gnome/scrollkeeper/doc/scrollkeeper_manual/C/fdl.html
-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/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
+share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
+share/gnome/scrollkeeper/stylesheets/index.xsl
+share/gnome/scrollkeeper/stylesheets/toc.xsl
+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
@@ -139,111 +58,35 @@ 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
-@comment "specially", or they will fail the pkg_delete MD5
-@comment check.  Don't just sort this plist :)
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/bg_BG
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/bg_BG.cp1251
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/de_AT
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en_AU
-@unexec /bin/rm -f %D/share/gnome/scrollkeeper/Templates/en_GB
-@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
+share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
+@dirrm share/gnome/scrollkeeper/stylesheets
+@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
+@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files
+@dirrm share/gnome/scrollkeeper/doc
 @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/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/TOC
 @dirrm share/gnome/scrollkeeper
 @dirrm share/gnome/omf/scrollkeeper
-@dirrm share/gnome/omf
-@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 mkdir -p /var/db/scrollkeeper
 @exec mkdir -p %D/share/gnome/scrollkeeper/TOC