This is a multipart MIME message.

--==_Exmh_47733564893280
Content-Type: text/plain; charset=us-ascii


tron@zhadum.org.uk said:
> What about building the documentation once, creating a ".tar.bz2" file
> and downloading that of "ftp.NetBSD.org"? 

I've tried something like that -- could someone please try the
appended patch?
It relies on the fact that DISTFILES are unpacked in order. Is that
safe to assume?
The prebuilt doc file is already at MASTER_SITES_LOCAL, but
I might change it before the fix is applied to pkgsrc, in
case problems show up.

best regards
Matthias





-------------------------------------------------------------------
-------------------------------------------------------------------
Forschungszentrum Juelich GmbH
52425 Juelich

Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDirig'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Dr. Sebastian M. Schmidt
-------------------------------------------------------------------
-------------------------------------------------------------------

--==_Exmh_47733564893280
Content-Type: text/plain ; name="gtk.txt"; charset=us-ascii
Content-Description: gtk.txt
Content-Disposition: attachment; filename="gtk.txt"

? buildlog
? gtk+-2.12.2
? gtk+-2.12.2-gtkdoc-html.tar.bz2
? work.zelz27
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2/Makefile,v
retrieving revision 1.148
diff -u -r1.148 Makefile
--- Makefile	27 Nov 2007 23:09:29 -0000	1.148
+++ Makefile	28 Nov 2007 17:55:15 -0000
@@ -8,6 +8,11 @@
 			${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
+# temporary hack for 2.12.2: use correctly built html doc
+_FIXEDDOC=	gtk+-2.12.2-gtkdoc-html.tar.bz2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${_FIXEDDOC}
+SITES.${_FIXEDDOC}=	${MASTER_SITES_LOCAL}
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		GIMP Toolkit v2 - libraries for building X11 user interfaces
@@ -61,10 +66,9 @@
 
 # XXX temporary hack, remove on update
 # The gtk-doc (html) docs are not properly packaged in 2.12.2.
-# We need to regenerate. Will hopefully fixed in the next gtk release.
-BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
-post-build:
-	(cd ${WRKSRC}/docs//reference/gtk && ${GMAKE} html-build.stamp)
+# Will hopefully fixed in the next gtk release.
+post-configure:
+	(cd ${WRKSRC}/docs/reference/gtk && ${GMAKE} just-copy-images)
 
 .include "options.mk"
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2/distinfo,v
retrieving revision 1.93
diff -u -r1.93 distinfo
--- distinfo	27 Nov 2007 21:45:46 -0000	1.93
+++ distinfo	28 Nov 2007 17:55:15 -0000
@@ -1,8 +1,12 @@
 $NetBSD: distinfo,v 1.93 2007/11/27 21:45:46 drochner Exp $
 
+SHA1 (gtk+-2.12.2-gtkdoc-html.tar.bz2) = db72858ca5c26bfd49a8ecaf45f0b0d7bf25dcd5
+RMD160 (gtk+-2.12.2-gtkdoc-html.tar.bz2) = e63c4f95c1ac736f517418a3620f78766158df56
+Size (gtk+-2.12.2-gtkdoc-html.tar.bz2) = 925120 bytes
 SHA1 (gtk+-2.12.2.tar.bz2) = 495ff3ef09de44cc23718239967203bd7871b4aa
 RMD160 (gtk+-2.12.2.tar.bz2) = b5cd6b7ec6abf557a6f82c707e0eafb67c813f8d
 Size (gtk+-2.12.2.tar.bz2) = 14723320 bytes
 SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
 SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
 SHA1 (patch-ai) = a71559e7f06a0334f19e3d44288dae5fcecff131
+SHA1 (patch-ba) = 4885469eafd53424d2581d9863119e105a4fdc41
Index: patches/patch-ba
===================================================================
RCS file: patches/patch-ba
diff -N patches/patch-ba
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-ba	28 Nov 2007 17:55:15 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- docs/reference/gtk/Makefile.in.orig	2007-11-28 17:33:40.000000000 +0100
++++ docs/reference/gtk/Makefile.in
+@@ -998,6 +998,10 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
+ 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	touch html-build.stamp
+ 
++# XXX temporary hack
++just-copy-images:
++	cd $(srcdir) && cp $(HTML_IMAGES) html
++
+ ##############
+ 
+ clean-local:

--==_Exmh_47733564893280--