update to 1.8

pkgsrc change: make SGML output optional, off per default, which saves
the heavyweight dependency on jade
other changes:
o Made it easier to include example code in the source code comment blocks.
  "|[ ... ]|" can be used to delineate example code (it just gets converted
  to "<informalexample><programlisting>"), and most of the text in example
  code is left as it is. The only thing that is still expanded is
  '#' to allow links to a symbol's documentation, e.g. '#GtkWidget'.
o Made the field widths wider for the HTML output, so it looks a bit nicer.
o Added a '--rebuild-sections' option to gtkdoc-scan to automatically rebuild
  the MODULE-sections.txt file. This only works if all the header files are
  organized neatly and functions don't need rearranging in the docs.
o Added a '--rebuild-types' option to gtkdoc-scan to automatically rebuild
  the MODULE.types file, so you don't need to add new types manually.
o Leave CDATA sections as they are, in the extra XML content files and within
  source code comment blocks.
o Allow the section id and #include's to be set within the "SECTION:" comment
  block, using "@Section_ID:xxx" and "@Include:".
o Added "--default-includes" option to specify the default #include's (for
  people who are using --rebuild-sections and so can't specify it in
  MODULE-sections.txt).
o Added a '--query-child-properties' argument to help document child
  properties of arbitrary GObjects (used by things like canvas widgets).
o Fixed documentation of signals of interfaces.

3 files changed, 16 insertions, 11 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 2afd79c85a2..b5eb7321046 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2006/08/06 19:03:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2007/04/10 17:38:27 drochner Exp $
 #
 
-DISTNAME=	gtk-doc-1.7
+DISTNAME=	gtk-doc-1.8
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.7/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,7 +12,6 @@ COMMENT=	Tools for authors of the GTK+ reference documentation
 
 DEPENDS+=	docbook-xml>=4.4nb1:../../textproc/docbook-xml
 DEPENDS+=	docbook-xsl>=1.68.1:../../textproc/docbook-xsl
-DEPENDS+=	dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
 
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	gtk-doc.pc.in
@@ -20,9 +19,16 @@ CONFIGURE_ARGS+=	--with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
 USE_DIRS+=		gnome2-1.6
 USE_TOOLS+=		perl:run
 
-SGML_CATALOGS=		${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gtkdoc
+PKG_SUPPORTED_OPTIONS=	sgml
+.include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Msgml)
+DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
+SGML_CATALOGS= ${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
 .include "../../textproc/jade/buildlink3.mk"
+.endif
+
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
diff --git a/textproc/gtk-doc/PLIST b/textproc/gtk-doc/PLIST
index 254a66ac465..8639613d311 100644
--- a/textproc/gtk-doc/PLIST
+++ b/textproc/gtk-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/08/06 09:35:53 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/04/10 17:38:29 drochner Exp $
 bin/gtkdoc-fixxref
 bin/gtkdoc-mkdb
 bin/gtkdoc-mkhtml
@@ -33,7 +33,6 @@ share/sgml/gtk-doc/gtk-doc.cat
 @dirrm share/omf/gtk-doc
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gtk-doc/data
-@dirrm share/gtk-doc
 @dirrm share/gnome/help/gtk-doc-manual/C
 @dirrm share/gnome/help/gtk-doc-manual
 @comment in gnome2-dirs: @dirrm share/gnome/help
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index 5d7a49f6206..751e09f990b 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2006/08/06 19:03:33 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2007/04/10 17:38:29 drochner Exp $
 
-SHA1 (gtk-doc-1.7.tar.bz2) = e864c8a76c6213a70e1429e087ba402872ba6345
-RMD160 (gtk-doc-1.7.tar.bz2) = 2f90344fe16e5984227d47a1a0c1543df3a26003
-Size (gtk-doc-1.7.tar.bz2) = 180213 bytes
+SHA1 (gtk-doc-1.8.tar.bz2) = cb47355347fd92025f348ae63b7f688225aaaabe
+RMD160 (gtk-doc-1.8.tar.bz2) = fbb3e36e3cdf9904439262b2bafab86017691984
+Size (gtk-doc-1.8.tar.bz2) = 186203 bytes