Thu Feb 20 09:43:33 2014 UTC ()
Update to 1.20. Add some dependencies so that gtk-depscan runs.
Mark as not ready for python-3.x.

GTK-Doc 1.20    (Feb 16 2014)
============

 Important notice - starting with the next release these long deprecated
 features will be removed, please write to gtk-doc-list@gnome.org and tell us
 your concerns:
 o gtkdoc-scanobj (only used for gtkobject)
 o return values need to be documented using "Returns:". We will remove the
   heuristic that turns a paragraph starting with "Returns " into return docs.
 o gtkdoc-mktmpl - please move all the comments into the sources.
 o generating html via sgml tools (jade/openjade), using xsltproc and
   docbook-xslt is pretty common and preferred since version 1.6

 Changes

 o 605537 : Returns: listed among parameters
 o 624001 : Support attribute-based method to deprecate symbols
 o 662424 : Class hierarchy about interfaces not generated by default
 o 665926 : should not have to document object structures
 o 666509 : Specifying --enable-gtk-doc should not be required to build source packages
 o 669417 : Duplicate IDs generated for unions registered as boxed types
 o 671519 : Self-test relies on nonportable (GNU enhanced) 'date' command
 o 692367 : gtkdocize should take a srcdir argument
 o 696570 : style updates
 o 697940 : Race condition between setup-build.stamp and scan-build.stamp
 o 701259 : /bin/bash: -chmod: command not found
 o 701638 : Support automake parallel test harness (fix error with GTKDOC_CHECK)
 o 706404 : Minor bug in gtkdoc-mkdb
 o 706438 : Empty lines added at the beginning and at the end of a programlisting
 o 707426 : master is broken in picking up flavour from configure.ac
 o 707717 : Support " Deprecated: X.Y "
 o 708268 : New *-insensitive.png files are not distributes
 o 710478 : gtkdoc-mkdb: Don't complain about annotations with hyphen
 o 711111 : gtkdoc-mkdb: sort entries in the glossary
 o 711598 : gtkdoc-scan doesn't ignore decorators containing parentheses
 o 719644 : docs: make yelp usage conditional in manual
 o 719645 : configure: emit message when looking for yelp
 o 720061 : make: create subdirectories of the content_files to the  builddir
 o 721228 : configure: search for xml catalog in XDG_DATA_DIRS
 o 722479 : cp -u is not portable
 o 723118 : Mark |[ blocks as CDATA
 o 723288 : Fix MarkDown support
 o 723417 : New MarkDown parser
 o 723696 : Add support for blockquote
 o 723812 : Add support for reference links
 o 723913 : List in markdown: < p > inside the last element of a < ul > list
 o 723991 : Improve the display of the synopsis
 o 724002 : gtkdoc-scan: Fix use of uninitialised value in trace logging

 Contributors

 Alban Browaeys
 Alexander Kanavin
 Carlos Garcia Campos
 Christian Kirbach
 Daniel Mustieles
 David King
 David Nečas
 Dieter Verfaillie
 Dimitris Spingos
 Hib Eris
 Matthias Clasen
 Philip Chimento
 Philip Withnall
 Rafael Ferreira
 Rico Tzschichholz
 Ryan Lortie
 Sebastian Rasmussen
 Sébastien Wilmet
 Stefan Sauer
 Stef Walter
 William Jon McCann
 Zbigniew Jędrzejewski-Szmek


(wiz)
diff -r1.51 -r1.52 pkgsrc/textproc/gtk-doc/Makefile
diff -r1.19 -r1.20 pkgsrc/textproc/gtk-doc/PLIST
diff -r1.20 -r1.21 pkgsrc/textproc/gtk-doc/distinfo
diff -r1.3 -r1.4 pkgsrc/textproc/gtk-doc/options.mk
diff -r0 -r1.1 pkgsrc/textproc/gtk-doc/patches/patch-configure

cvs diff -r1.51 -r1.52 pkgsrc/textproc/gtk-doc/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/gtk-doc/Makefile 2014/01/01 11:52:36 1.51
+++ pkgsrc/textproc/gtk-doc/Makefile 2014/02/20 09:43:33 1.52
@@ -1,30 +1,33 @@ @@ -1,30 +1,33 @@
1# $NetBSD: Makefile,v 1.51 2014/01/01 11:52:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2014/02/20 09:43:33 wiz Exp $
2# 
3 2
4DISTNAME= gtk-doc-1.18 3DISTNAME= gtk-doc-1.20
5PKGREVISION= 5 
6CATEGORIES= textproc 4CATEGORIES= textproc
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-doc/1.18/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-doc/1.20/}
8EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.xz
9 7
10MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gtk.org/gtk-doc/ 9HOMEPAGE= http://www.gtk.org/gtk-doc/
12COMMENT= Tools for authors of the GTK+ reference documentation 10COMMENT= Tools for authors of the GTK+ reference documentation
13LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1 11LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1
14 12
 13BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
15DEPENDS+= docbook-xml>=4.4nb1:../../textproc/docbook-xml 14DEPENDS+= docbook-xml>=4.4nb1:../../textproc/docbook-xml
16DEPENDS+= docbook-xsl>=1.68.1:../../textproc/docbook-xsl 15DEPENDS+= docbook-xsl>=1.68.1:../../textproc/docbook-xsl
17 16
18GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
19PKGCONFIG_OVERRIDE= gtk-doc.pc.in 18PKGCONFIG_OVERRIDE= gtk-doc.pc.in
20CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG:Q} 19CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
21USE_TOOLS+= gmake perl:run pkg-config msgfmt 20USE_TOOLS+= gmake perl:run pkg-config:run msgfmt
 21
 22PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.20
22 23
23.include "options.mk" 24.include "options.mk"
24 25
25.include "../../lang/python/application.mk" 26.include "../../lang/python/application.mk"
26.include "../../textproc/gnome-doc-utils/buildlink3.mk" 27.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 28# needed together with pkg-config by gtkdoc-depscan at runtime
 29.include "../../devel/glib2/buildlink3.mk"
27.include "../../textproc/libxslt/buildlink3.mk" 30.include "../../textproc/libxslt/buildlink3.mk"
28.include "../../mk/omf-scrollkeeper.mk" 31.include "../../mk/omf-scrollkeeper.mk"
29.include "../../textproc/xmlcatmgr/catalogs.mk" 32.include "../../textproc/xmlcatmgr/catalogs.mk"
30.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"

cvs diff -r1.19 -r1.20 pkgsrc/textproc/gtk-doc/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/gtk-doc/PLIST 2011/11/07 11:26:27 1.19
+++ pkgsrc/textproc/gtk-doc/PLIST 2014/02/20 09:43:33 1.20
@@ -1,57 +1,63 @@ @@ -1,57 +1,63 @@
1@comment $NetBSD: PLIST,v 1.19 2011/11/07 11:26:27 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.20 2014/02/20 09:43:33 wiz Exp $
2bin/gtkdoc-check 2bin/gtkdoc-check
3bin/gtkdoc-depscan 3bin/gtkdoc-depscan
4bin/gtkdoc-fixxref 4bin/gtkdoc-fixxref
5bin/gtkdoc-mkdb 5bin/gtkdoc-mkdb
6bin/gtkdoc-mkhtml 6bin/gtkdoc-mkhtml
7bin/gtkdoc-mkman 7bin/gtkdoc-mkman
8bin/gtkdoc-mkpdf 8bin/gtkdoc-mkpdf
9bin/gtkdoc-mktmpl 9bin/gtkdoc-mktmpl
10bin/gtkdoc-rebase 10bin/gtkdoc-rebase
11bin/gtkdoc-scan 11bin/gtkdoc-scan
12bin/gtkdoc-scangobj 12bin/gtkdoc-scangobj
13bin/gtkdoc-scanobj 13bin/gtkdoc-scanobj
14bin/gtkdocize 14bin/gtkdocize
15share/aclocal/gtk-doc.m4 15share/aclocal/gtk-doc.m4
16share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml 
17share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml 
18share/gnome/help/gtk-doc-manual/bn_IN/gtk-doc-manual.xml 
19share/gnome/help/gtk-doc-manual/de/gtk-doc-manual.xml 
20share/gnome/help/gtk-doc-manual/el/gtk-doc-manual.xml 
21share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml 
22share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml 
23share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml 
24share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml 
25share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml 
26share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml 
27share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml 
28share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml 
29share/gtk-doc/data/devhelp2.xsl 16share/gtk-doc/data/devhelp2.xsl
30share/gtk-doc/data/gtk-doc.dcl 17share/gtk-doc/data/gtk-doc.dcl
31share/gtk-doc/data/gtk-doc.dsl 18share/gtk-doc/data/gtk-doc.dsl
32share/gtk-doc/data/gtk-doc.flat.make 19share/gtk-doc/data/gtk-doc.flat.make
33share/gtk-doc/data/gtk-doc.make 20share/gtk-doc/data/gtk-doc.make
34share/gtk-doc/data/gtk-doc.notmpl-flat.make 21share/gtk-doc/data/gtk-doc.notmpl-flat.make
35share/gtk-doc/data/gtk-doc.notmpl.make 22share/gtk-doc/data/gtk-doc.notmpl.make
36share/gtk-doc/data/gtk-doc.xsl 23share/gtk-doc/data/gtk-doc.xsl
37share/gtk-doc/data/gtkdoc-common.pl 24share/gtk-doc/data/gtkdoc-common.pl
38share/gtk-doc/data/home.png 25share/gtk-doc/data/home.png
 26share/gtk-doc/data/left-insensitive.png
39share/gtk-doc/data/left.png 27share/gtk-doc/data/left.png
 28share/gtk-doc/data/right-insensitive.png
40share/gtk-doc/data/right.png 29share/gtk-doc/data/right.png
41share/gtk-doc/data/style.css 30share/gtk-doc/data/style.css
 31share/gtk-doc/data/up-insensitive.png
42share/gtk-doc/data/up.png 32share/gtk-doc/data/up.png
43share/gtk-doc/data/version-greater-or-equal.xsl 33share/gtk-doc/data/version-greater-or-equal.xsl
44share/omf/gtk-doc-manual/gtk-doc-manual-C.omf 34share/help/C/gtk-doc-manual/fdl-appendix.xml
45share/omf/gtk-doc-manual/gtk-doc-manual-bn_IN.omf 35share/help/C/gtk-doc-manual/index.docbook
46share/omf/gtk-doc-manual/gtk-doc-manual-de.omf 36share/help/bn_IN/gtk-doc-manual/fdl-appendix.xml
47share/omf/gtk-doc-manual/gtk-doc-manual-el.omf 37share/help/bn_IN/gtk-doc-manual/index.docbook
48share/omf/gtk-doc-manual/gtk-doc-manual-en_GB.omf 38share/help/de/gtk-doc-manual/fdl-appendix.xml
49share/omf/gtk-doc-manual/gtk-doc-manual-es.omf 39share/help/de/gtk-doc-manual/index.docbook
50share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf 40share/help/el/gtk-doc-manual/fdl-appendix.xml
51share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf 41share/help/el/gtk-doc-manual/index.docbook
52share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf 42share/help/en_GB/gtk-doc-manual/fdl-appendix.xml
53share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf 43share/help/en_GB/gtk-doc-manual/index.docbook
54share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf 44share/help/es/gtk-doc-manual/fdl-appendix.xml
55share/omf/gtk-doc-manual/gtk-doc-manual-te.omf 45share/help/es/gtk-doc-manual/index.docbook
 46share/help/fr/gtk-doc-manual/fdl-appendix.xml
 47share/help/fr/gtk-doc-manual/index.docbook
 48share/help/gu/gtk-doc-manual/fdl-appendix.xml
 49share/help/gu/gtk-doc-manual/index.docbook
 50share/help/pt_BR/gtk-doc-manual/fdl-appendix.xml
 51share/help/pt_BR/gtk-doc-manual/index.docbook
 52share/help/sl/gtk-doc-manual/fdl-appendix.xml
 53share/help/sl/gtk-doc-manual/index.docbook
 54share/help/sv/gtk-doc-manual/fdl-appendix.xml
 55share/help/sv/gtk-doc-manual/index.docbook
 56share/help/ta/gtk-doc-manual/fdl-appendix.xml
 57share/help/ta/gtk-doc-manual/index.docbook
 58share/help/te/gtk-doc-manual/fdl-appendix.xml
 59share/help/te/gtk-doc-manual/index.docbook
 60share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml
 61share/help/zh_CN/gtk-doc-manual/index.docbook
56share/pkgconfig/gtk-doc.pc 62share/pkgconfig/gtk-doc.pc
57share/sgml/gtk-doc/gtk-doc.cat 63share/sgml/gtk-doc/gtk-doc.cat

cvs diff -r1.20 -r1.21 pkgsrc/textproc/gtk-doc/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/gtk-doc/distinfo 2011/11/07 11:26:27 1.20
+++ pkgsrc/textproc/gtk-doc/distinfo 2014/02/20 09:43:33 1.21
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.20 2011/11/07 11:26:27 drochner Exp $ 1$NetBSD: distinfo,v 1.21 2014/02/20 09:43:33 wiz Exp $
2 2
3SHA1 (gtk-doc-1.18.tar.bz2) = ccc03d249f624ed5f88ecc857c6b454ddb1dd48b 3SHA1 (gtk-doc-1.20.tar.xz) = dac60c7044bfd2e8a2462c99aaf64b98c777dc51
4RMD160 (gtk-doc-1.18.tar.bz2) = 0c14e99a6b58f4d5930959543d0fa867afe416c8 4RMD160 (gtk-doc-1.20.tar.xz) = 0d8932b1a1e8560a1d5a1ecefc0a7a0ab25d412c
5Size (gtk-doc-1.18.tar.bz2) = 933706 bytes 5Size (gtk-doc-1.20.tar.xz) = 643892 bytes
 6SHA1 (patch-configure) = 780ed3114bbb4b7e16abfdfc8dd51004755c4245

cvs diff -r1.3 -r1.4 pkgsrc/textproc/gtk-doc/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/textproc/gtk-doc/Attic/options.mk 2013/10/31 09:05:32 1.3
+++ pkgsrc/textproc/gtk-doc/Attic/options.mk 2014/02/20 09:43:33 1.4
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: options.mk,v 1.3 2013/10/31 09:05:32 wiz Exp $ 1# $NetBSD: options.mk,v 1.4 2014/02/20 09:43:33 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gtkdoc 3PKG_OPTIONS_VAR= PKG_OPTIONS.gtkdoc
4PKG_SUPPORTED_OPTIONS= sgml 4PKG_SUPPORTED_OPTIONS= sgml
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Msgml) 8.if !empty(PKG_OPTIONS:Msgml)
 9# XXX: will be removed after 1.20
9DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular 10DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
10SGML_CATALOGS= ${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat 11SGML_CATALOGS= ${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
11DEPENDS+= openjade-[0-9]*:../../textproc/openjade 12DEPENDS+= openjade-[0-9]*:../../textproc/openjade
12.endif 13.endif

File Added: pkgsrc/textproc/gtk-doc/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2014/02/20 09:43:33 wiz Exp $

Fix unportable test(1) construct.

--- configure.orig	2014-02-20 09:35:29.000000000 +0000
+++ configure
@@ -12543,7 +12543,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether date can output nanoseconds" >&5
 $as_echo_n "checking whether date can output nanoseconds... " >&6; }
 date +%s.%N | grep -q '%N'
-if test "$?" == "1"; then
+if test "$?" = "1"; then
   TS_FMT="+%s.%N"
   ELAPSED_FMT="+%H:%M:%S.%N"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -12560,7 +12560,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether date can format dates" >&5
 $as_echo_n "checking whether date can format dates... " >&6; }
 date >/dev/null 2>&1 --utc --date @1.1 $ELAPSED_FMT
-if test "$?" == "0"; then
+if test "$?" = "0"; then
   DATE_FMT_CMD="date --utc $ELAPSED_FMT --date @0"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }