Install documentation under share/doc/html, not share/gtk-doc/html.

Also avoid possible detection of gtk-doc (not needed).
Bump PKGREVISION to 1.

4 files changed, 47 insertions, 32 deletions

diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 408405d092b..50afa8f27e9 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/12/24 03:44:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/04 19:58:00 jmmv Exp $
 #
 
 DISTNAME=		atk-1.2.0
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
@@ -21,6 +22,8 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/atk.pc.in
 
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+
 # glib-mkenums overflows a 2048kb stack on atkobject.h 
 UNLIMIT_RESOURCES=	stacksize
 
diff --git a/devel/atk/PLIST b/devel/atk/PLIST
index b481e1ec688..517dc985104 100644
--- a/devel/atk/PLIST
+++ b/devel/atk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/12/24 03:44:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/01/04 19:58:00 jmmv Exp $
 include/atk-1.0/atk/atk-enum-types.h
 include/atk-1.0/atk/atk.h
 include/atk-1.0/atk/atkaction.h
@@ -31,32 +31,32 @@ lib/libatk-1.0.so
 lib/libatk-1.0.so.200
 lib/libatk-1.0.so.200.0
 lib/pkgconfig/atk.pc
-share/gtk-doc/html/atk/atk-atkaction.html
-share/gtk-doc/html/atk/atk-atkcomponent.html
-share/gtk-doc/html/atk/atk-atkdocument.html
-share/gtk-doc/html/atk/atk-atkeditabletext.html
-share/gtk-doc/html/atk/atk-atkhypertext.html
-share/gtk-doc/html/atk/atk-atkimage.html
-share/gtk-doc/html/atk/atk-atkselection.html
-share/gtk-doc/html/atk/atk-atkstate.html
-share/gtk-doc/html/atk/atk-atkstreamablecontent.html
-share/gtk-doc/html/atk/atk-atktable.html
-share/gtk-doc/html/atk/atk-atktext.html
-share/gtk-doc/html/atk/atk-atkvalue.html
-share/gtk-doc/html/atk/atkgobjectaccessible.html
-share/gtk-doc/html/atk/atkhyperlink.html
-share/gtk-doc/html/atk/atknoopobject.html
-share/gtk-doc/html/atk/atknoopobjectfactory.html
-share/gtk-doc/html/atk/atkobject.html
-share/gtk-doc/html/atk/atkobjectfactory.html
-share/gtk-doc/html/atk/atkregistry.html
-share/gtk-doc/html/atk/atkrelation.html
-share/gtk-doc/html/atk/atkrelationset.html
-share/gtk-doc/html/atk/atkstateset.html
-share/gtk-doc/html/atk/atkutil.html
-share/gtk-doc/html/atk/atk.html
-share/gtk-doc/html/atk/book1.html
-share/gtk-doc/html/atk/index.sgml
+share/doc/html/atk/atk-atkaction.html
+share/doc/html/atk/atk-atkcomponent.html
+share/doc/html/atk/atk-atkdocument.html
+share/doc/html/atk/atk-atkeditabletext.html
+share/doc/html/atk/atk-atkhypertext.html
+share/doc/html/atk/atk-atkimage.html
+share/doc/html/atk/atk-atkselection.html
+share/doc/html/atk/atk-atkstate.html
+share/doc/html/atk/atk-atkstreamablecontent.html
+share/doc/html/atk/atk-atktable.html
+share/doc/html/atk/atk-atktext.html
+share/doc/html/atk/atk-atkvalue.html
+share/doc/html/atk/atk.html
+share/doc/html/atk/atkgobjectaccessible.html
+share/doc/html/atk/atkhyperlink.html
+share/doc/html/atk/atknoopobject.html
+share/doc/html/atk/atknoopobjectfactory.html
+share/doc/html/atk/atkobject.html
+share/doc/html/atk/atkobjectfactory.html
+share/doc/html/atk/atkregistry.html
+share/doc/html/atk/atkrelation.html
+share/doc/html/atk/atkrelationset.html
+share/doc/html/atk/atkstateset.html
+share/doc/html/atk/atkutil.html
+share/doc/html/atk/book1.html
+share/doc/html/atk/index.sgml
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/atk10.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/atk10.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/atk10.mo
@@ -72,8 +72,6 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/atk10.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/atk10.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/atk10.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/atk10.mo
-@dirrm share/gtk-doc/html/atk
-@unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || ${TRUE}
+@dirrm share/doc/html/atk
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index 1f240e0fa09..758cfc47700 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2002/12/24 03:44:18 wiz Exp $
+$NetBSD: distinfo,v 1.11 2003/01/04 19:58:00 jmmv Exp $
 
 SHA1 (atk-1.2.0.tar.bz2) = 0aa7fd2f49e953f568ab6b73a73126f731686483
 Size (atk-1.2.0.tar.bz2) = 285376 bytes
 SHA1 (patch-aa) = 58d79386a8113c4f57209124dfd00b3bc78da86f
+SHA1 (patch-ab) = b29335c0e693d296ede2591c488d41eaeb5f75d3
diff --git a/devel/atk/patches/patch-ab b/devel/atk/patches/patch-ab
new file mode 100644
index 00000000000..0700201b8f2
--- /dev/null
+++ b/devel/atk/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2003/01/04 19:58:00 jmmv Exp $
+
+--- docs/Makefile.in.orig	Sat Jan  4 15:54:20 2003
++++ docs/Makefile.in
+@@ -129,7 +129,7 @@ DOC_SOURCE_DIR = ../atk
+ 
+ INSTALLDIR = $(prefix)/share/gtk-doc
+ 
+-HTML_DIR = ${datadir}/gtk-doc/html
++HTML_DIR = ${datadir}/doc/html
+ 
+ # Header files to ignore when scanning
+ IGNORE_HFILES = atkmarshal.h atkintl.h