kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to 1.15

Browse source 
changes:
-Support for multiple DOC_SOURCE_DIR directories
-many bugfixes
This commit is contained in:
drochner 2010-06-11 13:16:08 +00:00
parent d30a9dd80e
commit 7fb53b60d8
5 changed files with 18 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
textproc/gtk-doc/Makefile
View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.40 2010/02/10 19:17:46 joerg Exp $
# $NetBSD: Makefile,v 1.41 2010/06/11 13:16:08 drochner Exp $
#
DISTNAME= gtk-doc-1.13
PKGREVISION= 2
DISTNAME= gtk-doc-1.15
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-doc/1.13/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-doc/1.15/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org

12
textproc/gtk-doc/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.16 2010/01/20 11:12:01 wiz Exp $
@comment $NetBSD: PLIST,v 1.17 2010/06/11 13:16:08 drochner Exp $
bin/gtkdoc-check
bin/gtkdoc-depscan
bin/gtkdoc-fixxref
@ -15,11 +15,16 @@ bin/gtkdocize
share/aclocal/gtk-doc.m4
share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/bn_IN/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/de/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/el/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml
share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml
share/gtk-doc/data/devhelp.xsl
share/gtk-doc/data/devhelp2.xsl
share/gtk-doc/data/gtk-doc.dcl
@ -35,10 +40,15 @@ share/gtk-doc/data/style.css
share/gtk-doc/data/up.png
share/gtk-doc/data/version-greater-or-equal.xsl
share/omf/gtk-doc-manual/gtk-doc-manual-C.omf
share/omf/gtk-doc-manual/gtk-doc-manual-bn_IN.omf
share/omf/gtk-doc-manual/gtk-doc-manual-de.omf
share/omf/gtk-doc-manual/gtk-doc-manual-el.omf
share/omf/gtk-doc-manual/gtk-doc-manual-en_GB.omf
share/omf/gtk-doc-manual/gtk-doc-manual-es.omf
share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf
share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf
share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf
share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf
share/omf/gtk-doc-manual/gtk-doc-manual-te.omf
share/pkgconfig/gtk-doc.pc
share/sgml/gtk-doc/gtk-doc.cat

10
textproc/gtk-doc/distinfo
View file

@ -1,7 +1,5 @@
$NetBSD: distinfo,v 1.17 2010/01/22 14:21:32 wiz Exp $
$NetBSD: distinfo,v 1.18 2010/06/11 13:16:08 drochner Exp $
SHA1 (gtk-doc-1.13.tar.bz2) = 8c6b157e594072aaf598bc7e68562ec02e50b651
RMD160 (gtk-doc-1.13.tar.bz2) = 36da31b769aa0e9d35c246160489d4c59a6f0e67
Size (gtk-doc-1.13.tar.bz2) = 644297 bytes
SHA1 (patch-aa) = 35a8774e7c670ead15a5a88341c37974378bda77
SHA1 (patch-ab) = 1e0304443e6ae11df39d301217a83ce741da944e
SHA1 (gtk-doc-1.15.tar.bz2) = fc1c593e8107cbe33451e3e938ca14b59104e999
RMD160 (gtk-doc-1.15.tar.bz2) = 142ad9dca015ba69261fe44847f3a27721e06551
Size (gtk-doc-1.15.tar.bz2) = 787687 bytes

78
textproc/gtk-doc/patches/patch-aa
View file

@ -1,78 +0,0 @@
$NetBSD: patch-aa,v 1.1 2010/01/22 14:21:32 wiz Exp $
From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Tue, 22 Dec 2009 11:54:31 +0000
Subject: fixxref: make it work again without --module argument, Fixes #605211
This restores a compatible behavior with previous versions of gtk-doc,
which is required by many tarballs.
--- gtkdoc-fixxref.in.orig 2009-12-17 19:36:51.000000000 +0000
+++ gtkdoc-fixxref.in
@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
}
}
-open (INPUT, "$MODULE-sections.txt")
- || die "Can't open $MODULE-sections.txt: $!";
-my $subsection = "";
-while (<INPUT>) {
- if (m/^#/) {
- next;
-
- } elsif (m/^<SECTION>/) {
- $subsection = "";
- } elsif (m/^<SUBSECTION\s*(.*)>/i) {
- $subsection = $1;
- } elsif (m/^<SUBSECTION>/) {
- next;
- } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
- next;
- } elsif (m/^<FILE>(.*)<\/FILE>/) {
- next;
- } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
- next;
- } elsif (m/^<\/SECTION>/) {
- next;
- } elsif (m/^(\S+)/) {
- my $symbol=CreateValidSGMLID($1);
-
- if ($subsection eq "Standard" || $subsection eq "Private") {
- $NoLinks{$symbol} = 1;
+if (defined($MODULE)) {
+ open (INPUT, "$MODULE-sections.txt")
+ || die "Can't open $MODULE-sections.txt: $!";
+ my $subsection = "";
+ while (<INPUT>) {
+ if (m/^#/) {
+ next;
+
+ } elsif (m/^<SECTION>/) {
+ $subsection = "";
+ } elsif (m/^<SUBSECTION\s*(.*)>/i) {
+ $subsection = $1;
+ } elsif (m/^<SUBSECTION>/) {
+ next;
+ } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
+ next;
+ } elsif (m/^<FILE>(.*)<\/FILE>/) {
+ next;
+ } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
+ next;
+ } elsif (m/^<\/SECTION>/) {
+ next;
+ } elsif (m/^(\S+)/) {
+ my $symbol=CreateValidSGMLID($1);
+
+ if ($subsection eq "Standard" || $subsection eq "Private") {
+ $NoLinks{$symbol} = 1;
+ }
}
}
+ close (INPUT);
}
-close (INPUT);
&FixCrossReferences ($MODULE_DIR);

31
textproc/gtk-doc/patches/patch-ab
View file

@ -1,31 +0,0 @@
$NetBSD: patch-ab,v 1.1 2010/01/22 14:21:32 wiz Exp $
From d1a042fbd75b7f8d44293fbee01e783be79d884c Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Mon, 03 Aug 2009 13:32:36 +0000
Subject: gtkdoc-scan: touch MODULE-overrides.txt when missing. Fixes #590625
gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST, so this
file must exist to be able to "make dist".
--- gtkdoc-scan.in.orig 2009-11-25 19:18:11.000000000 +0000
+++ gtkdoc-scan.in
@@ -180,12 +180,12 @@ if ($REBUILD_SECTIONS || ! -e $sections_
`cp $old_decl_list $sections_file`;
}
-# If there is no MODULE-overrides.txt file we create an empty one.
-# FIXME: why?
-#my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
-#if (! -e $overrides_file) {
-# `touch $overrides_file`;
-#}
+# If there is no MODULE-overrides.txt file we create an empty one
+# because EXTRA_DIST in gtk-doc.make requires it.
+my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
+if (! -e $overrides_file) {
+ `touch $overrides_file`;
+}