Update to 0.3.14. Changes since 0.3.12:

0.3.14
=======
- Build fixes:
        - Correct problem with distributed intltool scripts.
        - Update rpm spec file.

0.3.13
=======
- Runtime fixes:
        - Use a per-user directory for storing the extracted contents files.
          This avoids problems when multiple users share /tmp and use
          scrollkeeper.
        - Do XInclude processing on documents before extracting information.
        - By default, do not use the network to retrieve required DTDs.
                - Can be changed using the '-n' parameter to
                  scrollkeeper-install and friends.
        - Do not segfault if an OMF file is invalid.
- Build fixes:
        - Install various package documentation files.
        - Tidy up the build process a little bit and fix some portability bugs.
        - Update included gettext code.
        - Build fixes for specific platforms (Solaris and *BSD systems).
        - Detect installed version of the DocBook DTD at build time.
        - Allow the location of system XML catalog to be specified.
                - see the --with-xml-catalog flag.
        - Install locale-specific program files correctly (i.e. portably).
        - Allow scrollkeeper data directory to be customised
                - see the --with-partial-db-dir flag.
        - Upgrade supplied gettext and automake versions.
- Miscellaneous:
        - Correctly register translated versions of documents by considering
          their category, rather than their titles.
        - Don't leak file descriptors when updating the database. This fixes
          resource starvation problems on some systems.
        - Fix some memory leaks.
        - Should now work with IPv6-enabled systems.
        - When using a non-default prefix, the scrollkeeper log files are
          updated correctly.
        - Many Sourceforge bug tracker bugs fixed and all outstanding patches
          in the patch tracker evaluated and applied if appropriate.
- Translations updated.

8 files changed, 41 insertions, 100 deletions

diff --git a/textproc/scrollkeeper/INSTALL b/textproc/scrollkeeper/INSTALL
index 907fae847db..0e53377b4e3 100644
--- a/textproc/scrollkeeper/INSTALL
+++ b/textproc/scrollkeeper/INSTALL
@@ -1,11 +1,10 @@
-# $NetBSD: INSTALL,v 1.1 2003/02/18 14:39:02 jmmv Exp $
+# $NetBSD: INSTALL,v 1.2 2004/01/23 16:55:37 jmmv Exp $
 
 SCROLLKEEPER_REBUILDDB="@SCROLLKEEPER_REBUILDDB@"
 SCROLLKEEPER_DATADIR="@SCROLLKEEPER_DATADIR@"
 
 case ${STAGE} in
 POST-INSTALL)
-	${ECHO} "===> Building scrollkeeper's database"
 	${MKDIR} ${SCROLLKEEPER_DATADIR}
 	${MKDIR} ${SCROLLKEEPER_DATADIR}/log
 	${TOUCH} ${SCROLLKEEPER_DATADIR}/log/scrollkeeper.log
@@ -13,7 +12,6 @@ POST-INSTALL)
 	${SCROLLKEEPER_REBUILDDB} -q -p ${SCROLLKEEPER_DATADIR}/db > /dev/null 2>&1
 	;;
 DEINSTALL)
-	${ECHO} "===> Removing scrollkeeper's database"
 	${RM} -rf ${SCROLLKEEPER_DATADIR}
 	;;
 esac
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 9e4e26dd03e..1ffd84cfccc 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/23 16:55:37 jmmv Exp $
 #
 
-DISTNAME=		scrollkeeper-0.3.12
-PKGREVISION=		3
+DISTNAME=		scrollkeeper-0.3.14
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scrollkeeper/}	\
 			${MASTER_SITE_GNOME:=sources/scrollkeeper/0.3/}
@@ -26,6 +25,8 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS= 	--localstatedir=${SCROLLKEEPER_DATADIR}
 CONFIGURE_ARGS+=	--sharedstatedir=${SCROLLKEEPER_DATADIR}
 CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= 	--with-partial-db-dir=db
+CONFIGURE_ARGS+= 	--with-xml-catalog=${BUILDLINK_PREFIX.xmlcatmgr}/share/xml/catalog
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -50,5 +51,6 @@ CONF_FILES=	${EGDIR}/scrollkeeper.conf ${PKG_SYSCONFDIR}/scrollkeeper.conf
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
 .include "../../textproc/intltool/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/scrollkeeper/PLIST b/textproc/scrollkeeper/PLIST
index 5c9708a082e..33f3a00be68 100644
--- a/textproc/scrollkeeper/PLIST
+++ b/textproc/scrollkeeper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/02/18 14:39:02 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/01/23 16:55:37 jmmv Exp $
 bin/scrollkeeper-config
 bin/scrollkeeper-extract
 bin/scrollkeeper-gen-seriesid
@@ -25,7 +25,16 @@ man/man7/scrollkeeper.7
 man/man8/scrollkeeper-preinstall.8
 man/man8/scrollkeeper-rebuilddb.8
 man/man8/scrollkeeper-update.8
-share/doc/${PKGNAME}/COPYING-DOCS
+share/doc/${PKGNAME}/AUTHORS
+share/doc/${PKGNAME}/COPYING
+share/doc/${PKGNAME}/COPYING.DOC
+share/doc/${PKGNAME}/ChangeLog
+share/doc/${PKGNAME}/NEWS
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/TODO
+share/doc/${PKGNAME}/scrollkeeper-spec.txt
+share/examples/scrollkeeper/scrollkeeper.conf
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/scrollkeeper.mo
@@ -38,6 +47,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/scrollkeeper.mo
@@ -47,6 +57,8 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/scrollkeeper.mo
@@ -55,6 +67,8 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/scrollkeeper.mo
 ${PKGLOCALEDIR}/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/am/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/az/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/be/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
@@ -66,6 +80,7 @@ share/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/it/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/kn/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/no/scrollkeeper_cl.xml
@@ -75,8 +90,11 @@ share/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr@Latn/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
 share/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
@@ -85,13 +103,11 @@ share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf
 share/scrollkeeper/stylesheets/categories.xsl
 share/scrollkeeper/stylesheets/index.xsl
 share/scrollkeeper/stylesheets/toc.xsl
-share/examples/scrollkeeper/scrollkeeper.conf
 share/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
 share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
 @dirrm share/xml/scrollkeeper/dtds
 @dirrm share/xml/scrollkeeper
 @comment in xmlcatmgr: @dirrm share/xml
-@dirrm share/examples/scrollkeeper
 @dirrm share/scrollkeeper/stylesheets
 @dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
 @dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files
@@ -99,10 +115,11 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
 @dirrm share/scrollkeeper/Templates/zh_TW
 @dirrm share/scrollkeeper/Templates/zh_CN
 @dirrm share/scrollkeeper/Templates/vi
-@exec ${MKDIR} %D/share/scrollkeeper/Templates/uk
 @dirrm share/scrollkeeper/Templates/uk
 @dirrm share/scrollkeeper/Templates/tr
 @dirrm share/scrollkeeper/Templates/sv
+@dirrm share/scrollkeeper/Templates/sr@Latn
+@dirrm share/scrollkeeper/Templates/sr
 @dirrm share/scrollkeeper/Templates/sl
 @dirrm share/scrollkeeper/Templates/sk
 @dirrm share/scrollkeeper/Templates/ru
@@ -111,9 +128,8 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
 @dirrm share/scrollkeeper/Templates/pl
 @dirrm share/scrollkeeper/Templates/no
 @dirrm share/scrollkeeper/Templates/nl
-@exec ${MKDIR} %D/share/scrollkeeper/Templates/nb
-@dirrm share/scrollkeeper/Templates/nb
 @dirrm share/scrollkeeper/Templates/ko
+@dirrm share/scrollkeeper/Templates/kn
 @dirrm share/scrollkeeper/Templates/ja
 @dirrm share/scrollkeeper/Templates/it
 @dirrm share/scrollkeeper/Templates/hu
@@ -125,9 +141,12 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
 @dirrm share/scrollkeeper/Templates/cs
 @dirrm share/scrollkeeper/Templates/ca
 @dirrm share/scrollkeeper/Templates/be
+@dirrm share/scrollkeeper/Templates/az
+@dirrm share/scrollkeeper/Templates/am
 @dirrm share/scrollkeeper/Templates/C
 @dirrm share/scrollkeeper/Templates
 @dirrm share/scrollkeeper
 @dirrm share/omf/scrollkeeper
 @dirrm share/omf
+@dirrm share/examples/scrollkeeper
 @dirrm share/doc/${PKGNAME}
diff --git a/textproc/scrollkeeper/distinfo b/textproc/scrollkeeper/distinfo
index 0520b604db5..26184184efb 100644
--- a/textproc/scrollkeeper/distinfo
+++ b/textproc/scrollkeeper/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/02/18 14:39:03 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/01/23 16:55:37 jmmv Exp $
 
-SHA1 (scrollkeeper-0.3.12.tar.gz) = 4c89169eae7beee38a62dd418d67f91b903ea4ee
-Size (scrollkeeper-0.3.12.tar.gz) = 541937 bytes
-SHA1 (patch-aa) = 8f08423a064a88cb2bc61804ce115781e57942de
-SHA1 (patch-ab) = 8199a64dcea343a4c0c00c39265a4994ad6121e5
-SHA1 (patch-ac) = 2d0a3610e7c6b4bb5ed9e34f7a6943661025bd99
+SHA1 (scrollkeeper-0.3.14.tar.gz) = 0462799a2d96f46dec76f2fd057e2dfe8d7cb94d
+Size (scrollkeeper-0.3.14.tar.gz) = 679513 bytes
+SHA1 (patch-ac) = bd464789672250d8dc6d968ffd0f14735dec0848
 SHA1 (patch-ad) = 5577b0b5a1211911a5fa334bec6e6edef28aa10b
-SHA1 (patch-ae) = e90ed4d7ebcd7788602d8b0d968579a8cd6a4640
diff --git a/textproc/scrollkeeper/patches/patch-aa b/textproc/scrollkeeper/patches/patch-aa
deleted file mode 100644
index 69e5d51410d..00000000000
--- a/textproc/scrollkeeper/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2003/02/18 14:39:04 jmmv Exp $
-
---- configure.orig	2003-01-23 07:12:13.000000000 +0100
-+++ configure
-@@ -8795,7 +8795,7 @@ case "$host_os" in
-    *)
- 	echo "$as_me:$LINENO: checking for docbook-dtd412-xml" >&5
- echo $ECHO_N "checking for docbook-dtd412-xml... $ECHO_C" >&6
--	if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
-+	if xmlcatalog ${prefix}/share/xml/catalog "-//OASIS//DTD DocBook XML V4.2//EN" | grep "No entry" >/dev/null; then
- 		echo "* ERROR * "
- 		echo " "
- 		echo "Couldn't find the DocBook XML V4.1.2 DTD.  Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information."
-@@ -11523,6 +11523,7 @@ case "$host_os" in
-         SCROLLKEEPER_PARTIAL_DB_DIR=lib/scrollkeeper
- 	;;
- esac
-+SCROLLKEEPER_PARTIAL_DB_DIR=db
- 
- echo "$as_me:$LINENO: result: partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&5
- echo "${ECHO_T}partial database directory is $SCROLLKEEPER_PARTIAL_DB_DIR" >&6
diff --git a/textproc/scrollkeeper/patches/patch-ab b/textproc/scrollkeeper/patches/patch-ab
deleted file mode 100644
index b15612c8c7d..00000000000
--- a/textproc/scrollkeeper/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/02/18 14:39:04 jmmv Exp $
-
---- libs/i18n.c.orig	2003-01-23 07:10:57.000000000 +0100
-+++ libs/i18n.c
-@@ -62,21 +62,31 @@ static int explode_locale(const char *lo
- 
- 	if (dot_pos) {
- 		mask |= CODESET;
--		*codeset = strndup(dot_pos, at_pos - dot_pos);
--	} else {
-+		*codeset = (char*) malloc(at_pos - dot_pos + 1);
-+		strncpy(*codeset, dot_pos, at_pos - dot_pos);
-+		*codeset[at_pos - dot_pos] = '\0';
-+	}
-+	if (!dot_pos || !*codeset) {
- 		dot_pos = at_pos;
- 		*codeset = strdup("");
- 	}
- 
- 	if (uscore_pos) {
- 		mask |= TERRITORY;
--		*territory = strndup(uscore_pos, dot_pos - uscore_pos);
--	} else {
-+		*territory = (char*) malloc(dot_pos - uscore_pos + 1);
-+		strncpy(*territory, uscore_pos, dot_pos - uscore_pos);
-+		*territory[dot_pos - uscore_pos] = '\0';
-+	}
-+	if (!uscore_pos || !*territory) {
- 		uscore_pos = dot_pos;
- 		*territory = strdup("");
- 	}
- 
--	*language = strndup(locale, uscore_pos - locale);
-+	*language = (char*) malloc(uscore_pos - locale + 1);
-+	if (*language) {
-+		strncpy(*language, locale, uscore_pos - locale);
-+		*language[uscore_pos - locale] = '\0';
-+	}
- 
- 	return mask;
- }
diff --git a/textproc/scrollkeeper/patches/patch-ac b/textproc/scrollkeeper/patches/patch-ac
index 02b5c94f493..b0b1651b6d8 100644
--- a/textproc/scrollkeeper/patches/patch-ac
+++ b/textproc/scrollkeeper/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2003/02/18 14:39:04 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2004/01/23 16:55:37 jmmv Exp $
 
---- config/Makefile.in.orig	2003-01-23 07:11:59.000000000 +0100
+--- config/Makefile.in.orig	2003-12-06 09:17:57.000000000 +0100
 +++ config/Makefile.in
-@@ -141,7 +141,7 @@ am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
+@@ -181,7 +181,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  
 -pkgconfigdir = $(sysconfdir)
 +pkgconfigdir = $(datadir)/examples/scrollkeeper
diff --git a/textproc/scrollkeeper/patches/patch-ae b/textproc/scrollkeeper/patches/patch-ae
deleted file mode 100644
index f4c7984e474..00000000000
--- a/textproc/scrollkeeper/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/02/18 14:39:04 jmmv Exp $
-
---- libs/extract.c.orig	2003-01-23 07:10:57.000000000 +0100
-+++ libs/extract.c
-@@ -147,7 +147,7 @@ int apply_stylesheets (char *input_file,
- 			fputs(line, res_fid);
- 			if (num == 0) {
- 				num = 1;
--				fprintf(res_fid, "<!DOCTYPE %s PUBLIC \"-//OASIS//DTD DocBook V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">\n", doctype);
-+				fprintf(res_fid, "<!DOCTYPE %s PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\">\n", doctype);
- 			}
- 		}
- 		fclose(fid);