Update to 1.1:

2003-04-18  James Henstridge  <james@daa.com.au>

	* NEWS: add news items.

	* configure.in: increment version number.

2003-03-14  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in (OutputBook): Fix the public identifier for
	DocBook V3.0: Davenport, not DavenPort.
	(#108343, Mariano Suarez-Alvarez)

2003-03-10  James Henstridge  <james@daa.com.au>

	* configure.in: associate the chmod commands with the files they
	are chmod'ing.  This way config.status will always run the correct
	chmod command.

2003-03-04  James Henstridge  <james@daa.com.au>

	* configure.in: look up the docbook DTD by public id rather than
	system id.

2003-02-26  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkdb.in (GetArgs): Prefer template or comment docs over
	blurbs only if they're nonempty, otherwise the empty docs from the
	templates override all the blurbs.

2003-02-26  James Henstridge  <james@daa.com.au>

	* autogen.sh (THEDIR): set up so that it will choose automake 1.7
	or 1.6 in preference to 1.4.  Passes distcheck okay.

	* configure.in: update configure.in script to match
	recommendations of newer autoconf's, and add an AC_PREREQ()
	statement, since the xml catalog checks are using new autoconf
	features.

	* gtk-doc.make (xml-build.stamp): since other bits of the makefile
	were assuming xml, may as well hard code --output-format=xml.

2003-02-19  James Henstridge  <james@daa.com.au>

	* Makefile.am: get rid of the dist-hook, and just include the
	given files in EXTRA_DIST instead.

	* configure.in: provide meaningful names for the commands.

	* acinclude.m4 (JH_CHECK_XML_CATALOG): add some extra arguments: a
	friendly name for the catalog entry, and actions to run if the
	entry was found or not.  Also include a bit more information in
	the config.log file if an error occurs.

2003-02-18  Matthias Clasen  <maclas@gmx.de>

	* gtkdoc-mkhtml.in (declaration): Avoid the unportable grep
	option -q.  (#105311)

2003-02-19  James Henstridge  <james@daa.com.au>

	* devhelp.xsl: put chapters that aren't at the top level into the
	toc tree (to make gtk's .devhelp tree look better).

	* gtk-doc.spec.in (Requires): make the requires lines match
	current requirements ...

	* gtkdoc-mkhtml.in (XSLTPROC): pass --nonet to xsltproc, so we
	don't try to download DTDs and XSLT over the net.  The configure
	checks should catch people who don't have the correct files in
	their catalog.

2003-02-17  James Henstridge  <james@daa.com.au>

	* gtkdocize.in (--version): add --version argument.

2003-02-14  James Henstridge  <james@daa.com.au>

	* gtkdoc-mkdb.in (GetOptions): actually accept --tmpl-dir as a
	command line option.  Based on a patch from Simon Josefsson
	<jas@extundo.com>.

	* gtk-doc.xsl: remove the xmlns declaration.  Not really needed
	for html output anyway ...

2003-02-13  James Henstridge  <james@daa.com.au>

	* devhelp.xsl: remove refsect1's and refsect2's from book tree, as
	suggested by Hallski.

	* gtk-doc.make (install-data-local): the change to install images
	was superfluous, so I have removed it.
	(CLEANFILES): move some more stuff to CLEANFILES from the
	distclean-local rule.

2003-02-12  James Henstridge  <james@daa.com.au>

	* gtk-doc.make: add some chmod calls to work arround distcheck on
	automake >= 1.6.
	(install-data-local): copy the images as well as the html files
	during install.
	(uninstall-local): add an uninstall rule to remove the docs.
	(CLEANFILES): add $(DOC_MODULE)-scan.o to the list of files to be
	cleaned up.

2003-02-09  James Henstridge  <james@daa.com.au>

	* gtkdocize.in: script used to copy gtk-doc.make into another
	module.

	* gtk-doc.make: automake makefile fragment to handle gtk-doc
	support in other modules.

	* configure.in: check to make sure DocBook XML DTD and XSLT
	stylesheets are present in the XML catalog.

	* acinclude.m4 (JH_CHECK_XML_CATALOG): new macro to check for
	entries in the XML catalog.

2003-02-04  James Henstridge  <james@daa.com.au>

	* gtk-doc.m4: a macro to check for gtk-doc.

	* Makefile.am (gtkdocdata_DATA): don't bother installing xml.dcl.
	It isn't used anymore (since switching xml mode to xsltproc).

	* gtkdoc-mkhtml.in (gtkdocdir): and here.

	* Makefile.am (gtkdocdatadir): change dir.

	* configure.in: put data files in $(datadir)/gtk-doc/data, so that
	they don't all get mixed up with the html docs installed by other
	packages.

4 files changed, 26 insertions, 20 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 0efa57c49f7..0e337e3054f 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,21 +1,25 @@
-# $NetBSD: Makefile,v 1.7 2004/02/11 13:41:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/12 13:49:15 jmmv Exp $
 #
 
-DISTNAME=	gtk-doc-1.0
+DISTNAME=	gtk-doc-1.1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.1/}
 
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://www.gtk.org/rdp/
 COMMENT=	Tools for authors of the GTK+ reference documentation
 
+DEPENDS+=	docbook-xml>=4.2nb6:../../textproc/docbook-xml
+DEPENDS+=	docbook-xsl>=1.64.1nb3:../../textproc/docbook-xsl
 DEPENDS+=	dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gtk-doc.pc.in
+CONFIGURE_ARGS+=	--with-xml-catalog=${XML_DEFAULT_CATALOG}
 
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../textproc/jade/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gtk-doc/PLIST b/textproc/gtk-doc/PLIST
index 54a2dad5104..f043ed35b4c 100644
--- a/textproc/gtk-doc/PLIST
+++ b/textproc/gtk-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/11 13:41:46 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/02/12 13:49:15 jmmv Exp $
 bin/gtkdoc-fixxref
 bin/gtkdoc-mkdb
 bin/gtkdoc-mkhtml
@@ -7,15 +7,17 @@ bin/gtkdoc-mktmpl
 bin/gtkdoc-scan
 bin/gtkdoc-scangobj
 bin/gtkdoc-scanobj
+bin/gtkdocize
 lib/pkgconfig/gtk-doc.pc
-share/gtk-doc/devhelp.xsl
-share/gtk-doc/gtk-doc.dcl
-share/gtk-doc/gtk-doc.dsl
-share/gtk-doc/gtk-doc.xsl
-share/gtk-doc/gtkdoc-common.pl
-share/gtk-doc/home.png
-share/gtk-doc/left.png
-share/gtk-doc/right.png
-share/gtk-doc/up.png
-share/gtk-doc/xml.dcl
-@dirrm share/gtk-doc
+share/aclocal/gtk-doc.m4
+share/gtk-doc/data/devhelp.xsl
+share/gtk-doc/data/gtk-doc.dcl
+share/gtk-doc/data/gtk-doc.dsl
+share/gtk-doc/data/gtk-doc.make
+share/gtk-doc/data/gtk-doc.xsl
+share/gtk-doc/data/gtkdoc-common.pl
+share/gtk-doc/data/home.png
+share/gtk-doc/data/left.png
+share/gtk-doc/data/right.png
+share/gtk-doc/data/up.png
+@dirrm share/gtk-doc/data
diff --git a/textproc/gtk-doc/buildlink2.mk b/textproc/gtk-doc/buildlink2.mk
index 4b6aef9a486..7740beeb83d 100644
--- a/textproc/gtk-doc/buildlink2.mk
+++ b/textproc/gtk-doc/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/02/11 13:41:46 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/12 13:49:15 jmmv Exp $
 #
 
 .if !defined(GTK_DOC_BUILDLINK2_MK)
 GTK_DOC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtk-doc
-BUILDLINK_DEPENDS.gtk-doc?=	gtk-doc>=1.0
+BUILDLINK_DEPENDS.gtk-doc?=	gtk-doc>=1.1
 BUILDLINK_PKGSRCDIR.gtk-doc?=	../../textproc/gtk-doc
 BUILDLINK_DEPMETHOD.gtk-doc?=	build
 
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index 8610c729339..7ed98fa6a79 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/02/11 13:41:46 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/02/12 13:49:15 jmmv Exp $
 
-SHA1 (gtk-doc-1.0.tar.gz) = 79c7e71e8f7890b6be332bcf8ecb7f8a31d1db29
-Size (gtk-doc-1.0.tar.gz) = 139694 bytes
+SHA1 (gtk-doc-1.1.tar.gz) = b140fb44b5eb761dcd82d51a3076c00c6aa3aedf
+Size (gtk-doc-1.1.tar.gz) = 159055 bytes