3 files changed, 42 insertions, 41 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 3a8773eca71e..729484e67c87 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bonobo/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
+#   $MCom: ports/devel/bonobo/Makefile,v 1.5 2007/05/19 21:36:04 marcus Exp $
 #
 
 PORTNAME=	bonobo
 PORTVERSION=	1.0.22
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
diff --git a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
index 5fc3fc20b13a..36eac4b5a92a 100644
--- a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
+++ b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
  cxxflags_set = @cxxflags_set@
  l = @l@
  
--audio_ulaw_helpdir = $(datadir)/bonobo/docs/audio_ulaw/C
-+audio_ulaw_helpdir = $(datadir)/help/audio_ulaw/C
+-audio_ulaw_helpdir = $(datadir)/gnome/bonobo/docs/audio_ulaw/C
++audio_ulaw_helpdir = $(datadir)/gnome/help/bonobo/audio_ulaw/C
  
  # 
  # Module configuration information
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 4cc3ae908a2e..927719f611b7 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -177,41 +177,29 @@ libdata/pkgconfig/libefs.pc
 %%DOCSDIR%%/bonobo/bonobo-ui.html
 %%DOCSDIR%%/bonobo/bonobo-view.html
 %%DOCSDIR%%/bonobo/book1.html
-share/gnome/help/audio_ulaw/C/index.html
-share/gnome/idl/Bonobo.idl
-share/gnome/idl/Bonobo_Advise.idl
-share/gnome/idl/Bonobo_Canvas.idl
-share/gnome/idl/Bonobo_ClientSite.idl
-share/gnome/idl/Bonobo_Context.idl
-share/gnome/idl/Bonobo_Control.idl
-share/gnome/idl/Bonobo_Desktop.idl
-share/gnome/idl/Bonobo_Embeddable.idl
-share/gnome/idl/Bonobo_Exception.idl
-share/gnome/idl/Bonobo_ItemContainer.idl
-share/gnome/idl/Bonobo_Listener.idl
-share/gnome/idl/Bonobo_Moniker.idl
-share/gnome/idl/Bonobo_Persist.idl
-share/gnome/idl/Bonobo_Print.idl
-share/gnome/idl/Bonobo_Progressive.idl
-share/gnome/idl/Bonobo_Property.idl
-share/gnome/idl/Bonobo_Sample_Echo.idl
-share/gnome/idl/Bonobo_Storage.idl
-share/gnome/idl/Bonobo_UI.idl
-share/gnome/idl/Bonobo_Unknown.idl
-share/gnome/idl/Bonobo_Zoomable.idl
-share/gnome/oaf/Bonobo_Moniker_gzip.oaf
-share/gnome/oaf/Bonobo_Moniker_http.oaf
-share/gnome/oaf/Bonobo_Moniker_std.oaf
-share/gnome/oaf/Bonobo_Sample_Audio.oaf
-share/gnome/oaf/Bonobo_Sample_CanvasItem.oaf
-share/gnome/oaf/Bonobo_Sample_Controls.oaf
-share/gnome/oaf/Bonobo_Sample_Echo.oaf
-share/gnome/oaf/Bonobo_Sample_Hello.oafinfo
-share/gnome/oaf/Bonobo_Sample_Mines.oaf
-share/gnome/oaf/Bonobo_Sample_Paint.oaf
-share/gnome/oaf/Bonobo_Sample_Text.oaf
-share/gnome/oaf/Bonobo_Selector.oaf
+share/gnome/help/bonobo/audio_ulaw/C/index.html
 share/gnome/ui/gshell-ui.xml
+share/idl/Bonobo.idl
+share/idl/Bonobo_Advise.idl
+share/idl/Bonobo_Canvas.idl
+share/idl/Bonobo_ClientSite.idl
+share/idl/Bonobo_Context.idl
+share/idl/Bonobo_Control.idl
+share/idl/Bonobo_Desktop.idl
+share/idl/Bonobo_Embeddable.idl
+share/idl/Bonobo_Exception.idl
+share/idl/Bonobo_ItemContainer.idl
+share/idl/Bonobo_Listener.idl
+share/idl/Bonobo_Moniker.idl
+share/idl/Bonobo_Persist.idl
+share/idl/Bonobo_Print.idl
+share/idl/Bonobo_Progressive.idl
+share/idl/Bonobo_Property.idl
+share/idl/Bonobo_Sample_Echo.idl
+share/idl/Bonobo_Storage.idl
+share/idl/Bonobo_UI.idl
+share/idl/Bonobo_Unknown.idl
+share/idl/Bonobo_Zoomable.idl
 share/locale/az/LC_MESSAGES/bonobo.mo
 share/locale/ca/LC_MESSAGES/bonobo.mo
 share/locale/da/LC_MESSAGES/bonobo.mo
@@ -244,9 +232,22 @@ share/locale/uk/LC_MESSAGES/bonobo.mo
 share/locale/wa/LC_MESSAGES/bonobo.mo
 share/locale/zh_CN/LC_MESSAGES/bonobo.mo
 share/locale/zh_TW/LC_MESSAGES/bonobo.mo
-@dirrm share/gnome/help/audio_ulaw/C/images
-@dirrm share/gnome/help/audio_ulaw/C
-@dirrm share/gnome/help/audio_ulaw
+share/oaf/Bonobo_Moniker_gzip.oaf
+share/oaf/Bonobo_Moniker_http.oaf
+share/oaf/Bonobo_Moniker_std.oaf
+share/oaf/Bonobo_Sample_Audio.oaf
+share/oaf/Bonobo_Sample_CanvasItem.oaf
+share/oaf/Bonobo_Sample_Controls.oaf
+share/oaf/Bonobo_Sample_Echo.oaf
+share/oaf/Bonobo_Sample_Hello.oafinfo
+share/oaf/Bonobo_Sample_Mines.oaf
+share/oaf/Bonobo_Sample_Paint.oaf
+share/oaf/Bonobo_Sample_Text.oaf
+share/oaf/Bonobo_Selector.oaf
+@dirrm share/gnome/help/bonobo/audio_ulaw/C/images
+@dirrm share/gnome/help/bonobo/audio_ulaw/C
+@dirrm share/gnome/help/bonobo/audio_ulaw
+@dirrm share/gnome/help/bonobo
 @dirrm %%DOCSDIR%%/libefs
 @dirrm %%DOCSDIR%%/bonobo
 @dirrm %%DOCSDIR%%