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

Some PLIST cleanup (tell where shared directories are removed).
Bump PKGREVISION to 4.

5 files changed, 49 insertions, 73 deletions

diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index f272e9f36d4..6ab5104e49f 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/01/03 15:26:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/04 23:36:53 jmmv Exp $
 
 DISTNAME=		libbonobo-2.0.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -17,6 +17,9 @@ USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 .include "../../devel/bonobo-activation/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libbonobo/PLIST b/devel/libbonobo/PLIST
index f076dc50604..d5ea2c50a02 100644
--- a/devel/libbonobo/PLIST
+++ b/devel/libbonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/12 16:22:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/04 23:36:53 jmmv Exp $
 bin/echo-client-2
 include/libbonobo-2.0/bonobo/Bonobo.h
 include/libbonobo-2.0/bonobo/bonobo-arg.h
@@ -47,42 +47,43 @@ lib/orbit-2.0/Bonobo_module.a
 lib/orbit-2.0/Bonobo_module.la
 lib/orbit-2.0/Bonobo_module.so
 lib/pkgconfig/libbonobo-2.0.pc
-share/gtk-doc/html/libbonobo/c4.html
-share/gtk-doc/html/libbonobo/index.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-arg.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-config-database.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-context.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-event-source.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-exception.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-generic-factory.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-i18n.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-item-container.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-item-handler.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-listener.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-macros.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-main.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-context.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-extender.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-simple.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-util.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-object.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-client.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-file.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-stream.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-property-bag-client.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-property-bag.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-running-context.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-shlib-factory.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-shutdown.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-storage-memory.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-storage.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-stream-client.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-stream-memory.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-transient.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-types.html
-share/gtk-doc/html/libbonobo/libbonobo-bonobo-xobject.html
+share/doc/html/libbonobo/c4.html
+share/doc/html/libbonobo/index.html
+share/doc/html/libbonobo/index.sgml
+share/doc/html/libbonobo/libbonobo-bonobo-arg.html
+share/doc/html/libbonobo/libbonobo-bonobo-config-database.html
+share/doc/html/libbonobo/libbonobo-bonobo-context.html
+share/doc/html/libbonobo/libbonobo-bonobo-event-source.html
+share/doc/html/libbonobo/libbonobo-bonobo-exception.html
+share/doc/html/libbonobo/libbonobo-bonobo-generic-factory.html
+share/doc/html/libbonobo/libbonobo-bonobo-i18n.html
+share/doc/html/libbonobo/libbonobo-bonobo-item-container.html
+share/doc/html/libbonobo/libbonobo-bonobo-item-handler.html
+share/doc/html/libbonobo/libbonobo-bonobo-listener.html
+share/doc/html/libbonobo/libbonobo-bonobo-macros.html
+share/doc/html/libbonobo/libbonobo-bonobo-main.html
+share/doc/html/libbonobo/libbonobo-bonobo-moniker-context.html
+share/doc/html/libbonobo/libbonobo-bonobo-moniker-extender.html
+share/doc/html/libbonobo/libbonobo-bonobo-moniker-simple.html
+share/doc/html/libbonobo/libbonobo-bonobo-moniker-util.html
+share/doc/html/libbonobo/libbonobo-bonobo-moniker.html
+share/doc/html/libbonobo/libbonobo-bonobo-object.html
+share/doc/html/libbonobo/libbonobo-bonobo-persist-client.html
+share/doc/html/libbonobo/libbonobo-bonobo-persist-file.html
+share/doc/html/libbonobo/libbonobo-bonobo-persist-stream.html
+share/doc/html/libbonobo/libbonobo-bonobo-persist.html
+share/doc/html/libbonobo/libbonobo-bonobo-property-bag-client.html
+share/doc/html/libbonobo/libbonobo-bonobo-property-bag.html
+share/doc/html/libbonobo/libbonobo-bonobo-running-context.html
+share/doc/html/libbonobo/libbonobo-bonobo-shlib-factory.html
+share/doc/html/libbonobo/libbonobo-bonobo-shutdown.html
+share/doc/html/libbonobo/libbonobo-bonobo-storage-memory.html
+share/doc/html/libbonobo/libbonobo-bonobo-storage.html
+share/doc/html/libbonobo/libbonobo-bonobo-stream-client.html
+share/doc/html/libbonobo/libbonobo-bonobo-stream-memory.html
+share/doc/html/libbonobo/libbonobo-bonobo-transient.html
+share/doc/html/libbonobo/libbonobo-bonobo-types.html
+share/doc/html/libbonobo/libbonobo-bonobo-xobject.html
 share/idl/bonobo-2.0/Bonobo.idl
 share/idl/bonobo-2.0/Bonobo_Canvas.idl
 share/idl/bonobo-2.0/Bonobo_Clipboard.idl
@@ -128,7 +129,11 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrm share/idl/bonobo-2.0
-@dirrm share/gtk-doc/html/libbonobo
+@comment in ORBit2: @dirrm share/idl
+@dirrm share/doc/html/libbonobo
+@comment in ORBit2: dirrm lib/orbit-2.0
+@comment in bonobo-activation: @dirrm lib/bonobo/servers
+@comment in bonobo-activation: @dirrm lib/bonobo/monikers
 @dirrm lib/bonobo-2.0/samples
 @dirrm lib/bonobo-2.0
 @dirrm include/libbonobo-2.0/bonobo
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index d5aed80740c..830f6e82749 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/12 16:22:58 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/01/04 23:36:54 jmmv Exp $
 
 SHA1 (libbonobo-2.0.0.tar.bz2) = 7a42a169af5a493854b79cef20951504913f727b
 Size (libbonobo-2.0.0.tar.bz2) = 470293 bytes
-SHA1 (patch-aa) = 8d89014b6ccf9929a3dd0a91e84a0fb002e1800d
-SHA1 (patch-ab) = 1e7319c1a9731c9a0519f21ac72a3a9b58a83f68
diff --git a/devel/libbonobo/patches/patch-aa b/devel/libbonobo/patches/patch-aa
deleted file mode 100644
index 8b601e37dbf..00000000000
--- a/devel/libbonobo/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/12 16:22:58 wiz Exp $
-
---- doc/api/Makefile.am.orig	Thu Jun 27 22:50:45 2002
-+++ doc/api/Makefile.am	Thu Jun 27 22:51:00 2002
-@@ -152,8 +152,8 @@
- 	    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); \
-+	  echo '-- Installing $(srcdir)/html/index.html' ; \
-+	  $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- 	fi)
- 
- #
diff --git a/devel/libbonobo/patches/patch-ab b/devel/libbonobo/patches/patch-ab
deleted file mode 100644
index a7c0596b4b3..00000000000
--- a/devel/libbonobo/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/12 16:22:58 wiz Exp $
-
---- doc/api/Makefile.in.orig	Sat Jun  1 19:04:34 2002
-+++ doc/api/Makefile.in
-@@ -362,8 +367,8 @@
- 	    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); \
-+	  echo '-- Installing $(srcdir)/html/index.html' ; \
-+	  $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- 	fi)
- 
- #