summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-02-18 14:39:02 +0000
committerjmmv <jmmv@pkgsrc.org>2003-02-18 14:39:02 +0000
commite3f5102cf0fedade45366b1f342d152434e80e57 (patch)
tree288d7adaea56fad2e133781b644938e46fc9c0ff /textproc
parent80ae5d23803ba13eb2f9687d1bf8adb2d9a40741 (diff)
downloadpkgsrc-e3f5102cf0fedade45366b1f342d152434e80e57.tar.gz
Update to 0.3.12. There have been lots of changes since 0.2 (this version
is almost a rewrite of the program). Note that this is still a development version but includes new features that may be required by packages using scrollkeeper (which won't work with the old 0.2). Provide a framework to automatically rebuild scrollkeeper's database from packages installing OMF files under share/omf/; they only need to include omf.mk in their Makefile and take care to install OMF files in the said directory. Reviewed by rh and wiz.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/scrollkeeper/INSTALL19
-rw-r--r--textproc/scrollkeeper/Makefile48
-rw-r--r--textproc/scrollkeeper/PLIST258
-rw-r--r--textproc/scrollkeeper/buildlink2.mk32
-rw-r--r--textproc/scrollkeeper/distinfo16
-rw-r--r--textproc/scrollkeeper/files/install.tmpl16
-rw-r--r--textproc/scrollkeeper/omf.mk33
-rw-r--r--textproc/scrollkeeper/patches/patch-aa39
-rw-r--r--textproc/scrollkeeper/patches/patch-ab52
-rw-r--r--textproc/scrollkeeper/patches/patch-ac46
-rw-r--r--textproc/scrollkeeper/patches/patch-ad33
-rw-r--r--textproc/scrollkeeper/patches/patch-ae32
12 files changed, 295 insertions, 329 deletions
diff --git a/textproc/scrollkeeper/INSTALL b/textproc/scrollkeeper/INSTALL
new file mode 100644
index 00000000000..907fae847db
--- /dev/null
+++ b/textproc/scrollkeeper/INSTALL
@@ -0,0 +1,19 @@
+# $NetBSD: INSTALL,v 1.1 2003/02/18 14:39:02 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
+ ${MKDIR} ${SCROLLKEEPER_DATADIR}/db
+ ${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 a5d6a39b497..68e0247018f 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,29 +1,53 @@
-# $NetBSD: Makefile,v 1.8 2002/10/19 10:54:58 rh Exp $
+# $NetBSD: Makefile,v 1.9 2003/02/18 14:39:02 jmmv Exp $
#
-DISTNAME= scrollkeeper-0.2
-PKGREVISION= 2
+DISTNAME= scrollkeeper-0.3.12
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scrollkeeper/} \
- ${MASTER_SITE_GNOME:=sources/scrollkeeper/0.2/}
+ ${MASTER_SITE_GNOME:=sources/scrollkeeper/0.3/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://scrollkeeper.sourceforge.net/
COMMENT= Open Document Cataloging Project
BUILD_USES_MSGFMT= yes
-USE_GMAKE= yes
-USE_X11BASE= yes
-USE_BUILDLINK2= yes
+DEPENDS= docbook-xml>=4.2:../../textproc/docbook-xml
+GNU_CONFIGURE= yes
+USE_BUILDLINK2= yes
+USE_GMAKE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+USE_PKGINSTALL= yes
+USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --localstatedir=${X11PREFIX}/var
-CONFIGURE_ARGS+= --sharedstatedir=${X11PREFIX}/var
+LIBTOOL_OVERRIDE= ${WRKSRC}/libconfig
+
+CONFIGURE_ARGS= --localstatedir=${SCROLLKEEPER_DATADIR}
+CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${LOCALBASE} == ${X11PREFIX}
+CONFIGURE_ARGS+= --with-omfdirs=${PREFIX}/share/omf
+.else
+CONFIGURE_ARGS+= --with-omfdirs=${LOCALBASE}/share/omf:${X11PREFIX}/share/omf
+.endif
+
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
+SCROLLKEEPER_DATADIR= ${PREFIX}/libdata/scrollkeeper
+SCROLLKEEPER_REBUILDDB= ${PREFIX}/bin/scrollkeeper-rebuilddb
+FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}"
+FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}"
+
+EGDIR= ${PREFIX}/share/examples/scrollkeeper
+CONF_FILES= ${EGDIR}/scrollkeeper.conf ${PKG_SYSCONFDIR}/scrollkeeper.conf
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../textproc/libxml/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../textproc/libxslt/buildlink2.mk"
+.include "../../textproc/intltool/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/scrollkeeper/PLIST b/textproc/scrollkeeper/PLIST
index 92d8f2de33a..5c9708a082e 100644
--- a/textproc/scrollkeeper/PLIST
+++ b/textproc/scrollkeeper/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2002/12/09 16:01:45 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/02/18 14:39:02 jmmv 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,246 +13,121 @@ bin/scrollkeeper-preinstall
bin/scrollkeeper-rebuilddb
bin/scrollkeeper-uninstall
bin/scrollkeeper-update
-bin/scrollkeeper_toc
lib/libscrollkeeper.a
lib/libscrollkeeper.la
lib/libscrollkeeper.so
lib/libscrollkeeper.so.0
lib/libscrollkeeper.so.0.0
-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
-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/ja/LC_MESSAGES/scrollkeeper.mo
-share/locale/ko/LC_MESSAGES/scrollkeeper.mo
-share/locale/nl/LC_MESSAGES/scrollkeeper.mo
-share/locale/no/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
-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/doc/${PKGNAME}/COPYING-DOCS
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/scrollkeeper.mo
+${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/ko/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/scrollkeeper.mo
+${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/sv/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/scrollkeeper.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/scrollkeeper.mo
+${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/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/be/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_PT
share/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
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
-@exec ${MKDIR} %D/share/scrollkeeper/doc/scrollkeeper_manual/C/figures
-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-extended-contents-list.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
-@dirrm share/scrollkeeper/Templates/zh
-@dirrm share/scrollkeeper/Templates/wa
+share/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_CN/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/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
+@dirrm share/scrollkeeper/doc
+@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/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
+@exec ${MKDIR} %D/share/scrollkeeper/Templates/nb
@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
@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/be
@dirrm share/scrollkeeper/Templates/C
@dirrm share/scrollkeeper/Templates
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual/C/stylesheet-images
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual/C/figures
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual/C
-@dirrm share/scrollkeeper/doc/scrollkeeper_manual
-@dirrm share/scrollkeeper/doc
@dirrm share/scrollkeeper
-@unexec ${RMDIR} %D/share/omf/scrollkeeper || ${TRUE}
-@unexec ${RMDIR} %D/share/omf || ${TRUE}
-@dirrm share/doc/scrollkeeper-0.2
-@exec ${MKDIR} %D/var/lib/scrollkeeper
-@exec scrollkeeper-rebuilddb
-@unexec ${RM} -rf %D/var/lib/scrollkeeper
-@dirrm var/lib
-@dirrm var
+@dirrm share/omf/scrollkeeper
+@dirrm share/omf
+@dirrm share/doc/${PKGNAME}
diff --git a/textproc/scrollkeeper/buildlink2.mk b/textproc/scrollkeeper/buildlink2.mk
index 42a5b9e6e9c..0fafedbe46b 100644
--- a/textproc/scrollkeeper/buildlink2.mk
+++ b/textproc/scrollkeeper/buildlink2.mk
@@ -1,24 +1,40 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/11/02 02:08:01 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/02/18 14:39:02 jmmv Exp $
.if !defined(SCROLLKEEPER_BUILDLINK2_MK)
SCROLLKEEPER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= scrollkeeper
-BUILDLINK_DEPENDS.scrollkeeper?= scrollkeeper>=0.2
+BUILDLINK_DEPENDS.scrollkeeper?= scrollkeeper>=0.3.12
BUILDLINK_PKGSRCDIR.scrollkeeper?= ../../textproc/scrollkeeper
EVAL_PREFIX+= BUILDLINK_PREFIX.scrollkeeper=scrollkeeper
-BUILDLINK_PREFIX.scrollkeeper_DEFAULT= ${X11PREFIX}
+BUILDLINK_PREFIX.scrollkeeper_DEFAULT= ${LOCALBASE}
BUILDLINK_FILES.scrollkeeper+= lib/libscrollkeeper.*
BUILDLINK_TARGETS+= scrollkeeper-buildlink
+BUILDLINK_TARGETS+= scrollkeeper-buildlink-fake
-.if exists(${LOCALBASE}/libdata/scrollkeeper)
-SCROLLKEEPER_DATADIR= ${LOCALBASE}/libdata
-.else
-SCROLLKEEPER_DATADIR= ${BUILDLINK_PREFIX.scrollkeeper}/var/lib
-.endif
+_SK_FAKE_UPDATE= ${BUILDLINK_DIR}/bin/scrollkeeper-update
+_SK_FAKE_REBUILDDB= ${BUILDLINK_DIR}/bin/scrollkeeper-rebuilddb
scrollkeeper-buildlink: _BUILDLINK_USE
+scrollkeeper-buildlink-fake:
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ if [ ! -f ${_SK_FAKE_UPDATE} ]; then \
+ ${ECHO_BUILDLINK_MSG} "Creating ${_SK_FAKE_UPDATE}"; \
+ ${MKDIR} ${_SK_FAKE_UPDATE:H}; \
+ ${ECHO} "#!/bin/sh" > ${_SK_FAKE_UPDATE}; \
+ ${ECHO} "echo '[pkgsrc] Doing nothing for scrollkeeper-update' \$$*" >> ${_SK_FAKE_UPDATE}; \
+ ${CHMOD} +x ${_SK_FAKE_UPDATE}; \
+ fi
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ if [ ! -f ${_SK_FAKE_REBUILDDB} ]; then \
+ ${ECHO_BUILDLINK_MSG} "Creating ${_SK_FAKE_REBUILDDB}"; \
+ ${MKDIR} ${_SK_FAKE_REBUILDDB:H}; \
+ ${ECHO} "#!/bin/sh" > ${_SK_FAKE_REBUILDDB}; \
+ ${ECHO} "echo '[pkgsrc] Doing nothing for scrollkeeper-rebuilddb' \$$*" >> ${_SK_FAKE_REBUILDDB}; \
+ ${CHMOD} +x ${_SK_FAKE_REBUILDDB}; \
+ fi
+
.endif # SCROLLKEEPER_BUILDLINK2_MK
diff --git a/textproc/scrollkeeper/distinfo b/textproc/scrollkeeper/distinfo
index 2713a50d2ab..0520b604db5 100644
--- a/textproc/scrollkeeper/distinfo
+++ b/textproc/scrollkeeper/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2002/10/11 09:25:55 rh Exp $
+$NetBSD: distinfo,v 1.8 2003/02/18 14:39:03 jmmv Exp $
-SHA1 (scrollkeeper-0.2.tar.gz) = 2f1f7ce884d64d3f7e6222a373372635cdf8508e
-Size (scrollkeeper-0.2.tar.gz) = 308061 bytes
-SHA1 (patch-aa) = 0588a4ebcc4cbf1249afe7b153c22ece7605fea7
-SHA1 (patch-ab) = 5e293438129fb2573a36cd74731f1cc262f50dd3
-SHA1 (patch-ac) = 32bbe5475c706212990930c0388afedb9827a845
-SHA1 (patch-ad) = 388af631a3e3111ec38736320e688c842da7773f
-SHA1 (patch-ae) = 75c8dbf68b2de211b355e9fad18094239c8e3c4e
+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 (patch-ad) = 5577b0b5a1211911a5fa334bec6e6edef28aa10b
+SHA1 (patch-ae) = e90ed4d7ebcd7788602d8b0d968579a8cd6a4640
diff --git a/textproc/scrollkeeper/files/install.tmpl b/textproc/scrollkeeper/files/install.tmpl
new file mode 100644
index 00000000000..a3479919262
--- /dev/null
+++ b/textproc/scrollkeeper/files/install.tmpl
@@ -0,0 +1,16 @@
+# $NetBSD: install.tmpl,v 1.1 2003/02/18 14:39:03 jmmv Exp $
+
+SCROLLKEEPER_DATADIR="@SCROLLKEEPER_DATADIR@"
+SCROLLKEEPER_REBUILDDB="@SCROLLKEEPER_REBUILDDB@"
+SCROLLKEEPER_UPDATEDB="@SCROLLKEEPER_UPDATEDB@"
+
+case ${STAGE} in
+POST-INSTALL)
+ ${ECHO} "===> Adding ${PKGNAME} to scrollkeeper's database"
+ ${SCROLLKEEPER_UPDATEDB} -q -p ${SCROLLKEEPER_DATADIR}/db > /dev/null 2>&1
+ ;;
+DEINSTALL)
+ ${ECHO} "===> Removing ${PKGNAME} from scrollkeeper's database"
+ ${SCROLLKEEPER_UPDATEDB} -q -p ${SCROLLKEEPER_DATADIR}/db > /dev/null 2>&1
+ ;;
+esac
diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
new file mode 100644
index 00000000000..d68ad268c10
--- /dev/null
+++ b/textproc/scrollkeeper/omf.mk
@@ -0,0 +1,33 @@
+# $NetBSD: omf.mk,v 1.1 2003/02/18 14:39:03 jmmv Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# OMF files. It takes care of registering them in scrollkeeper's global
+# database.
+#
+# The following variables are automatically defined for free use in packages:
+# SCROLLKEEPER_DATADIR - scrollkeeper's data directory.
+# SCROLLKEEPER_REBUILDDB - scrollkeeper-rebuilddb binary program.
+# SCROLLKEEPER_UPDATEDB - scrollkeeper-updatedb binary program.
+#
+
+.if !defined(SCROLLKEEPER_OMF_MK)
+SCROLLKEEPER_OMF_MK= # defined
+
+# scrollkeeper's data directory.
+SCROLLKEEPER_DATADIR= ${BUILDLINK_PREFIX.scrollkeeper}/libdata/scrollkeeper
+
+# scrollkeeper binary programs.
+SCROLLKEEPER_REBUILDDB= ${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-rebuilddb
+SCROLLKEEPER_UPDATEDB= ${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-updatedb
+
+USE_PKGINSTALL= YES
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
+
+FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}"
+FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}"
+FILES_SUBST+= SCROLLKEEPER_UPDATEDB="${SCROLLKEEPER_UPDATEDB}"
+
+.include "../../textproc/scrollkeeper/buildlink2.mk"
+
+.endif # SCROLLKEEPER_OMF_MK
diff --git a/textproc/scrollkeeper/patches/patch-aa b/textproc/scrollkeeper/patches/patch-aa
index 6e04a98edc9..69e5d51410d 100644
--- a/textproc/scrollkeeper/patches/patch-aa
+++ b/textproc/scrollkeeper/patches/patch-aa
@@ -1,22 +1,21 @@
-$NetBSD: patch-aa,v 1.4 2002/10/11 09:25:55 rh Exp $
+$NetBSD: patch-aa,v 1.5 2003/02/18 14:39:04 jmmv Exp $
---- toc/src/toc-extract.c.orig Fri Oct 13 00:53:39 2000
-+++ toc/src/toc-extract.c
-@@ -97,7 +97,7 @@
+--- 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
- stack_el = find_first_element (context, element_list);
-
-- if (!stack_el->ignore)
-+ if (stack_el != NULL && !stack_el->ignore)
- {
- print_indent(context->depth);
- printf("</tocsect%d>\n", context->depth-1);
-@@ -190,7 +190,7 @@
-
- stack_el = find_first_element (context, element_list);
-
-- if (stack_el->title_output)
-+ if (stack_el == NULL || stack_el->title_output)
- {
- list_free (element_list);
- return;
+ 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
index 8c78ae3949d..b15612c8c7d 100644
--- a/textproc/scrollkeeper/patches/patch-ab
+++ b/textproc/scrollkeeper/patches/patch-ab
@@ -1,21 +1,41 @@
-$NetBSD: patch-ab,v 1.2 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ab,v 1.3 2003/02/18 14:39:04 jmmv Exp $
---- cl/src/get-cl.c.orig Thu Mar 15 21:10:33 2001
-+++ cl/src/get-cl.c
-@@ -19,6 +19,7 @@
- #include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <libintl.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -29,7 +30,7 @@
+--- 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
- #define SCROLLKEEPERLOCALEDIR "/usr/share/locale"
+ 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("");
+ }
--#define PATHLEN 256
-+#define PATHLEN MAXPATHLEN
+ 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("");
+ }
- static char **av;
+- *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 95961c70b92..02b5c94f493 100644
--- a/textproc/scrollkeeper/patches/patch-ac
+++ b/textproc/scrollkeeper/patches/patch-ac
@@ -1,41 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ac,v 1.4 2003/02/18 14:39:04 jmmv Exp $
---- cl/src/install.c.orig Thu Mar 15 21:10:33 2001
-+++ cl/src/install.c
-@@ -24,6 +24,7 @@
- #include <locale.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <errno.h>
- #include <libintl.h>
- #include <dirent.h>
-@@ -34,7 +35,7 @@
- #define _(String) gettext (String)
+--- config/Makefile.in.orig 2003-01-23 07:11:59.000000000 +0100
++++ config/Makefile.in
+@@ -141,7 +141,7 @@ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
- #define SEP "|"
--#define PATHLEN 256
-+#define PATHLEN MAXPATHLEN
+-pkgconfigdir = $(sysconfdir)
++pkgconfigdir = $(datadir)/examples/scrollkeeper
- static int verbose = 0;
-
-@@ -512,7 +513,7 @@
- {
- char source_file[PATHLEN], target_file[PATHLEN];
-
-- sprintf(command, "mkdir %s/%s", scrollkeeper_dir, dir_ent->d_name);
-+ sprintf(command, "mkdir -p %s/%s", scrollkeeper_dir, dir_ent->d_name);
- system(command);
- sprintf(source_file, "%s/scrollkeeper_cl.xml", source_path);
- sprintf(target_file, "%s/%s/scrollkeeper_cl.xml",
-@@ -610,7 +611,9 @@
- stat(toc_dir, &buf);
- if (!S_ISDIR(buf.st_mode))
- {
-- sprintf(command, "mkdir %s", toc_dir);
-+ sprintf(command, "rm -f %s", toc_dir);
-+ system(command);
-+ sprintf(command, "mkdir -p %s", toc_dir);
- system(command);
- }
+ pkgconfig_DATA = scrollkeeper.conf
diff --git a/textproc/scrollkeeper/patches/patch-ad b/textproc/scrollkeeper/patches/patch-ad
index 68b67213c26..cb7972d73b7 100644
--- a/textproc/scrollkeeper/patches/patch-ad
+++ b/textproc/scrollkeeper/patches/patch-ad
@@ -1,21 +1,18 @@
-$NetBSD: patch-ad,v 1.1 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ad,v 1.2 2003/02/18 14:39:04 jmmv Exp $
---- cl/src/uninstall.c.orig Thu Mar 15 21:10:33 2001
-+++ cl/src/uninstall.c
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <libintl.h>
- #include <locale.h>
- #include <scrollkeeper.h>
-@@ -31,7 +32,7 @@
+--- Makefile.in.orig 2003-01-23 07:11:56.000000000 +0100
++++ Makefile.in
+@@ -536,13 +536,6 @@ dist-hook: scrollkeeper.spec
- #define _(String) gettext (String)
+ # Build/rebuild the catalog
+ install-data-hook:
+- 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)
--#define PATHLEN 256
-+#define PATHLEN MAXPATHLEN
-
- struct IdTab {
- int id;
+ # Remove generated files
+ uninstall-local:
diff --git a/textproc/scrollkeeper/patches/patch-ae b/textproc/scrollkeeper/patches/patch-ae
index 764288f10ff..f4c7984e474 100644
--- a/textproc/scrollkeeper/patches/patch-ae
+++ b/textproc/scrollkeeper/patches/patch-ae
@@ -1,21 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2002/04/03 20:38:35 rh Exp $
+$NetBSD: patch-ae,v 1.2 2003/02/18 14:39:04 jmmv Exp $
---- cl/src/update.c.orig Thu Mar 15 21:10:33 2001
-+++ cl/src/update.c
-@@ -19,6 +19,7 @@
- #include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -32,7 +33,7 @@
-
- #define SCROLLKEEPERLOCALEDIR "/usr/share/locale"
-
--#define PATHLEN 256
-+#define PATHLEN MAXPATHLEN
-
- char **av;
-
+--- 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);