6 files changed, 16 insertions, 60 deletions
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 551f96570da..aab76603a4d 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2004/06/05 00:30:01 xtraeme Exp $
+# $NetBSD: Makefile,v 1.28 2004/06/20 20:37:32 jmmv Exp $
 
-DISTNAME=		libbonobo-2.6.0
+DISTNAME=		libbonobo-2.6.2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -31,6 +31,10 @@ EGDIR=			${PREFIX}/share/examples/bonobo-activation
 CONF_FILES=		${EGDIR}/bonobo-activation-config.xml \
 			${PKG_SYSCONFDIR}/bonobo-activation-config.xml
 
+PRINT_PLIST_AWK+=	/^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \
+				{ print "@unexec $${RMDIR} %D/" $$2 \
+				  " 2>/dev/null || $${TRUE}"; next; }
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/devel/libbonobo/PLIST b/devel/libbonobo/PLIST
index eb98905f25b..04ef0872de3 100644
--- a/devel/libbonobo/PLIST
+++ b/devel/libbonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/01 18:18:00 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/06/20 20:37:32 jmmv Exp $
 bin/activation-client
 bin/bonobo-activation-run-query
 bin/bonobo-slay
@@ -114,13 +114,17 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libbonobo-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libbonobo-2.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libbonobo-2.0.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libbonobo-2.0.mo
@@ -140,6 +144,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libbonobo-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libbonobo-2.0.mo
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 08a6b614ec0..66cd4735bf0 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.9 2004/04/24 19:30:15 danw Exp $
-$NetBSD: distinfo,v 1.9 2004/04/24 19:30:15 danw Exp $
+$NetBSD: distinfo,v 1.10 2004/06/20 20:37:32 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2004/06/20 20:37:32 jmmv Exp $
 
-SHA1 (libbonobo-2.6.0.tar.bz2) = 65d3173e9b7b5d72c0d23e482b0ea54f8e1d9150
-Size (libbonobo-2.6.0.tar.bz2) = 1059444 bytes
+SHA1 (libbonobo-2.6.2.tar.bz2) = c5e63619c86bbf24282620bff05194caa86286da
+Size (libbonobo-2.6.2.tar.bz2) = 1055680 bytes
 SHA1 (patch-aa) = 4f7b7a16f7cba64206b5dccb021972a09efe9f55
 SHA1 (patch-ab) = 320fc0a2be131a0ab6b200643fb733f80899a005
-SHA1 (patch-ac) = 256aec5eaa1d04ce9bed162c8698f6ebce6e4b0d
-SHA1 (patch-ad) = 224d9114c285a0c6ef06b7ced6aec34b8abf538f
 SHA1 (patch-ae) = d1f6cfe8aa05d7ac1ae840762c440bca26a48727
-SHA1 (patch-af) = f8a4e366f7c26fc16270b9d16c8eaf46615510ec
diff --git a/devel/libbonobo/patches/patch-ac b/devel/libbonobo/patches/patch-ac
deleted file mode 100644
index b2c3d42d753..00000000000
--- a/devel/libbonobo/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/02/27 02:09:34 snj Exp $
-
---- bonobo-activation/bonobo-activation-init.c.orig	2004-02-26 18:03:07.000000000 -0800
-+++ bonobo-activation/bonobo-activation-init.c	2004-02-26 18:04:57.000000000 -0800
-@@ -34,6 +34,7 @@
- #include "bonobo-activation-private.h"
- #include "bonobo-activation-register.h"
- #include "bonobo-activation-version.h"
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <fcntl.h>
-@@ -44,7 +45,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/socket.h>
--#include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
- 
diff --git a/devel/libbonobo/patches/patch-ad b/devel/libbonobo/patches/patch-ad
deleted file mode 100644
index def73ceeffd..00000000000
--- a/devel/libbonobo/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/04/01 18:18:00 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=137193
-
---- bonobo-activation/bonobo-activation-get-language-list.c	9 Jun 2003 13:17:55 -0000	1.2
-+++ bonobo-activation/bonobo-activation-get-language-list.c	14 Mar 2004 21:37:13 -0000
-@@ -71,6 +71,7 @@
-   int i;
-   if (!alias_table)
-     {
-+      read_aliases (BONOBO_ACTIVATION_LOCALEDIR "/locale.alias");
-       read_aliases ("/usr/share/locale/locale.alias");
-       read_aliases ("/usr/local/share/locale/locale.alias");
-       read_aliases ("/usr/lib/X11/locale/locale.alias");
diff --git a/devel/libbonobo/patches/patch-af b/devel/libbonobo/patches/patch-af
deleted file mode 100644
index 55ef0450cd5..00000000000
--- a/devel/libbonobo/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/04/24 19:30:15 danw Exp $
-
---- bonobo-activation/bonobo-activation-client.c.orig	Mon Apr 12 18:42:20 2004
-+++ bonobo-activation/bonobo-activation-client.c
-@@ -197,6 +197,11 @@ get_lang_list (void)
-         return result;
- }
- 
-+#if defined(__APPLE__)
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- extern char **environ;
- 
- void