replace previous Darwin fixes with a simpler patch from GNOME CVS

5 files changed, 16 insertions, 53 deletions

diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 5a3b4e240dc..08a6b614ec0 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.8 2004/04/14 20:21:49 adam Exp $
+$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 $
 
 SHA1 (libbonobo-2.6.0.tar.bz2) = 65d3173e9b7b5d72c0d23e482b0ea54f8e1d9150
 Size (libbonobo-2.6.0.tar.bz2) = 1059444 bytes
@@ -7,7 +8,4 @@ SHA1 (patch-ab) = 320fc0a2be131a0ab6b200643fb733f80899a005
 SHA1 (patch-ac) = 256aec5eaa1d04ce9bed162c8698f6ebce6e4b0d
 SHA1 (patch-ad) = 224d9114c285a0c6ef06b7ced6aec34b8abf538f
 SHA1 (patch-ae) = d1f6cfe8aa05d7ac1ae840762c440bca26a48727
-SHA1 (patch-af) = b5a38bc2b8f75356f41898338ffcaf772034dde4
-SHA1 (patch-ag) = 54c8312cf9911cf6d9eae3f4616d1cac313d7aaa
-SHA1 (patch-ah) = 3270ce9369a5166a498406fe048eb91d2c8750d3
-SHA1 (patch-ai) = da64566c066c0ad2aa9c6b2a22702c55ec9e60ec
+SHA1 (patch-af) = f8a4e366f7c26fc16270b9d16c8eaf46615510ec
diff --git a/devel/libbonobo/patches/patch-af b/devel/libbonobo/patches/patch-af
index 9336c35f7a1..55ef0450cd5 100644
--- a/devel/libbonobo/patches/patch-af
+++ b/devel/libbonobo/patches/patch-af
@@ -1,12 +1,16 @@
-$NetBSD: patch-af,v 1.1 2004/04/14 20:21:49 adam Exp $
+$NetBSD: patch-af,v 1.2 2004/04/24 19:30:15 danw Exp $
 
---- bonobo-activation/Makefile.in.orig	Wed Apr 14 21:30:19 2004
-+++ bonobo-activation/Makefile.in
-@@ -223,7 +223,6 @@ INCLUDES = \
- AM_LDFLAGS = \
- 	$(LIBBONOBO_LIBS)			\
- 	$(BONOBO_ACTIVATION_LT_VERSION_INFO)	\
--	-no-undefined				\
- 	$(NULL)
+--- 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
diff --git a/devel/libbonobo/patches/patch-ag b/devel/libbonobo/patches/patch-ag
deleted file mode 100644
index ecb51ab0ede..00000000000
--- a/devel/libbonobo/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/04/14 20:21:49 adam Exp $
-
---- bonobo/Makefile.in.orig	Wed Apr 14 21:53:16 2004
-+++ bonobo/Makefile.in
-@@ -261,7 +261,7 @@ libbonobo_2_la_LIBADD = \
- 	../bonobo-activation/libbonobo-activation.la
- 
- 
--libbonobo_2_la_LDFLAGS = -no-undefined
-+libbonobo_2_la_LDFLAGS =
- 
- libbonoboincludedir = $(includedir)/libbonobo-2.0/bonobo
- 
diff --git a/devel/libbonobo/patches/patch-ah b/devel/libbonobo/patches/patch-ah
deleted file mode 100644
index a9d790c186c..00000000000
--- a/devel/libbonobo/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/04/14 20:21:49 adam Exp $
-
---- monikers/Makefile.in.orig	Wed Apr 14 21:54:19 2004
-+++ monikers/Makefile.in
-@@ -243,7 +243,7 @@ libmoniker_std_2_la_SOURCES = \
- 	bonobo-moniker-std.c			
- 
- 
--libmoniker_std_2_la_LDFLAGS = -module -avoid-version -no-undefined
-+libmoniker_std_2_la_LDFLAGS = -module -avoid-version
- libmoniker_std_2_la_LIBADD = $(top_builddir)/bonobo/libbonobo-2.la \
- 	$(top_builddir)/bonobo-activation/libbonobo-activation.la \
- 	$(LIBBONOBO_LIBS)
diff --git a/devel/libbonobo/patches/patch-ai b/devel/libbonobo/patches/patch-ai
deleted file mode 100644
index 06a76824f82..00000000000
--- a/devel/libbonobo/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/04/14 20:21:49 adam Exp $
-
---- tests/test-activation/Makefile.in.orig	Wed Apr 14 21:59:19 2004
-+++ tests/test-activation/Makefile.in
-@@ -232,7 +232,7 @@ bonobo_activation_test_LDADD = libtest-p
- # get libtool to build a noinst shared lib.
- libtest_plugin_la_LDFLAGS = \
- 	-rpath $(shell (cd $(top_builddir);pwd))/test/.libs 	\
--	-module -avoid-version -no-undefined
-+	-module -avoid-version
- 
- 
- libtest_plugin_la_LIBADD = \