Instead of rebuilding the HTML doc, use a prebuilt tarball distributed

from MASTER_SITE_LOCAL==ftp.netbsd.org. This saves much time in build,
and it works around the problem in PR pkg/37446 where documentation
build failed due to ressource shortage.
Thanks to Matthias Scheler for discussion and testing.

3 files changed, 33 insertions, 6 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 9bde3cfa3f0..cc2b18b0806 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2007/11/27 23:09:29 tron Exp $
+# $NetBSD: Makefile,v 1.149 2007/11/29 22:10:17 drochner Exp $
 
 DISTNAME=		gtk+-2.12.2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
@@ -8,6 +8,12 @@ MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.12/ \
 			${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_SITE_LOCAL}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		GIMP Toolkit v2 - libraries for building X11 user interfaces
@@ -61,10 +67,12 @@ SUBST_FILES.pthread=	gdk-pixbuf/Makefile.in
 
 # 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.
+USE_TOOLS+=	bzcat tar
+post-configure:
+	${BZCAT} <${DISTDIR}/${DIST_SUBDIR}/${FIXEDDOC} | \
+		(cd ${WRKDIR} && ${TAR} xf -)
+	(cd ${WRKSRC}/docs/reference/gtk && ${GMAKE} just-copy-images)
 
 .include "options.mk"
 
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 8ce64795e55..d5a99a2f3a6 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.93 2007/11/27 21:45:46 drochner Exp $
+$NetBSD: distinfo,v 1.94 2007/11/29 22:10:17 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
diff --git a/x11/gtk2/patches/patch-ba b/x11/gtk2/patches/patch-ba
new file mode 100644
index 00000000000..72907d0f3e8
--- /dev/null
+++ b/x11/gtk2/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.1 2007/11/29 22:10:17 drochner Exp $
+
+--- 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: