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

(and fix the PLIST... it seems docs were not installed before)
Do not depend on gtk-doc, as the package comes with prebuilt docs.
Bump PKGREVISION to 2.

4 files changed, 40 insertions, 21 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 426d52b66da..916c26bfb2c 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/12/24 06:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/04 20:43:36 jmmv Exp $
 #
 
 DISTNAME=		bonobo-activation-2.1.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo-activation/2.1/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,7 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://developer.gnome.org/
 COMMENT=		Object activation framework for GNOME2
 
-BUILD_DEPENDS+=		gtk-doc-[0-9]*:../../textproc/gtk-doc
 BUILD_USES_MSGFMT=	YES
 
 USE_X11=		YES
@@ -24,6 +23,9 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/bonobo-activation-2.0.pc.in
 GNU_CONFIGURE=		YES
 
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
diff --git a/devel/bonobo-activation/PLIST b/devel/bonobo-activation/PLIST
index 59bbcfe1cf2..1bd534ae755 100644
--- a/devel/bonobo-activation/PLIST
+++ b/devel/bonobo-activation/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/10/27 09:30:59 rh Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/01/04 20:43:36 jmmv Exp $
 bin/activation-client
 bin/bonobo-slay
 etc/bonobo-activation/bonobo-activation-config.xml
@@ -25,7 +25,38 @@ lib/pkgconfig/bonobo-activation-2.0.pc
 libexec/bonobo-activation-server
 man/man1/bonobo-activation-server.1
 sbin/bonobo-activation-sysconf
-share/gtk-doc/html/bonobo-activation/bonobo-activation.png
+share/doc/html/bonobo-activation/api-reference.html
+share/doc/html/bonobo-activation/architecture.html
+share/doc/html/bonobo-activation/async-activation.html
+share/doc/html/bonobo-activation/attribute-tag.html
+share/doc/html/bonobo-activation/bonobo-activation-debugging.html
+share/doc/html/bonobo-activation/bonobo-activation-initialization.html
+share/doc/html/bonobo-activation/bonobo-activation-query-and-activation.html
+share/doc/html/bonobo-activation/bonobo-activation-registration.html
+share/doc/html/bonobo-activation/bonobo-activation-utilities.html
+share/doc/html/bonobo-activation/bonobo-activation.png
+share/doc/html/bonobo-activation/checklist.html
+share/doc/html/bonobo-activation/configuring.html
+share/doc/html/bonobo-activation/fdl-section1.html
+share/doc/html/bonobo-activation/fdl-section10.html
+share/doc/html/bonobo-activation/fdl-section2.html
+share/doc/html/bonobo-activation/fdl-section3.html
+share/doc/html/bonobo-activation/fdl-section4.html
+share/doc/html/bonobo-activation/fdl-section5.html
+share/doc/html/bonobo-activation/fdl-section6.html
+share/doc/html/bonobo-activation/fdl-section7.html
+share/doc/html/bonobo-activation/fdl-section8.html
+share/doc/html/bonobo-activation/fdl-section9.html
+share/doc/html/bonobo-activation/fdl-using.html
+share/doc/html/bonobo-activation/fdl.html
+share/doc/html/bonobo-activation/index.html
+share/doc/html/bonobo-activation/index.sgml
+share/doc/html/bonobo-activation/migrating.html
+share/doc/html/bonobo-activation/query-langage.html
+share/doc/html/bonobo-activation/query-syntax.html
+share/doc/html/bonobo-activation/server-arch.html
+share/doc/html/bonobo-activation/server-xml-reference.html
+share/doc/html/bonobo-activation/tutorial.html
 share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl
 share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl
 share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
@@ -70,7 +101,7 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/bonobo-activation.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bonobo-activation.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo
 @dirrm share/idl/bonobo-activation-2.0
-@dirrm share/gtk-doc/html/bonobo-activation
+@dirrm share/doc/html/bonobo-activation
 @dirrm lib/bonobo/servers
 @unexec ${RMDIR} %D/lib/bonobo 2>/dev/null || ${TRUE}
 @dirrm include/bonobo-activation-2.0/bonobo-activation
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index e56b4cfcac1..b49e454db7f 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/10/30 03:09:29 rh Exp $
+$NetBSD: distinfo,v 1.7 2003/01/04 20:43:36 jmmv Exp $
 
 SHA1 (bonobo-activation-2.1.0.tar.bz2) = c4a645573ce234c30c7b1d7d25befe7f94d3c8bc
 Size (bonobo-activation-2.1.0.tar.bz2) = 452883 bytes
-SHA1 (patch-aa) = bb2de068441860108ae049a10c6edc072defda96
 SHA1 (patch-ac) = e13034cc28f8fcf3b27a39db2a6002c8444de0bf
 SHA1 (patch-ad) = 25a374f25860e3c857b663db95d32a383d40eae4
diff --git a/devel/bonobo-activation/patches/patch-aa b/devel/bonobo-activation/patches/patch-aa
deleted file mode 100644
index 933050027eb..00000000000
--- a/devel/bonobo-activation/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/27 08:57:58 rh Exp $
-
---- api-docs/Makefile.in.orig	Sat Apr 27 17:49:53 2002
-+++ api-docs/Makefile.in
-@@ -390,8 +390,6 @@
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
--	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
- 	fi)
- 
- #