Update to 2.3.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@862 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 76 insertions, 23 deletions

diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 2559f33fa..fd6254ef5 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	2.3.1
-PORTREVISION=	2
-#PORTREVISION=	0
+PORTVERSION=	2.3.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 8ca3004cb..baf52759c 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-2.3.1.tar.bz2) = ad452a56b6d348446843d2ceb85ca9ba
+MD5 (gnome2/libbonobo-2.3.3.tar.bz2) = 1513b7989a2786ec7b1063417595db80
diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c
new file mode 100644
index 000000000..52cfebcd9
--- /dev/null
+++ b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c
@@ -0,0 +1,18 @@
+--- bonobo-activation/bonobo-activation-init.c.orig	Sat Jun 14 02:09:52 2003
++++ bonobo-activation/bonobo-activation-init.c	Sat Jun 14 02:10:13 2003
+@@ -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/files/patch-ltmain.sh b/devel/libbonobo/files/patch-ltmain.sh
index 8afc42e39..2719aeb6c 100644
--- a/devel/libbonobo/files/patch-ltmain.sh
+++ b/devel/libbonobo/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
-+++ ltmain.sh	Sun May 11 02:27:13 2003
-@@ -1061,7 +1061,7 @@
+--- ltmain.sh.orig	Thu Jun  5 08:09:04 2003
++++ ltmain.sh	Sat Jun 14 01:36:34 2003
+@@ -1280,7 +1280,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1071,8 +1071,16 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
  	continue
  	;;
  
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2471,6 +2479,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4280,10 +4291,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 09458449b..19d84c65a 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -7,8 +7,6 @@ include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h
 include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-base-service.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-id.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
@@ -64,6 +62,43 @@ libdata/pkgconfig/bonobo-activation-2.0.pc
 libdata/pkgconfig/libbonobo-2.0.pc
 libexec/bonobo-activation-server
 sbin/bonobo-activation-sysconf
+share/doc/bonobo-activation/api-reference.html
+share/doc/bonobo-activation/architecture.html
+share/doc/bonobo-activation/async-activation.html
+share/doc/bonobo-activation/attribute-tag.html
+share/doc/bonobo-activation/bonobo-activation-Debugging.html
+share/doc/bonobo-activation/bonobo-activation-Initialization.html
+share/doc/bonobo-activation/bonobo-activation-Query-and-Activation.html
+share/doc/bonobo-activation/bonobo-activation-Registration.html
+share/doc/bonobo-activation/bonobo-activation-Utilities.html
+share/doc/bonobo-activation/bonobo-activation.devhelp
+share/doc/bonobo-activation/bonobo-activation.png
+share/doc/bonobo-activation/checklist.html
+share/doc/bonobo-activation/configuring.html
+share/doc/bonobo-activation/fdl-section1.html
+share/doc/bonobo-activation/fdl-section10.html
+share/doc/bonobo-activation/fdl-section2.html
+share/doc/bonobo-activation/fdl-section3.html
+share/doc/bonobo-activation/fdl-section4.html
+share/doc/bonobo-activation/fdl-section5.html
+share/doc/bonobo-activation/fdl-section6.html
+share/doc/bonobo-activation/fdl-section7.html
+share/doc/bonobo-activation/fdl-section8.html
+share/doc/bonobo-activation/fdl-section9.html
+share/doc/bonobo-activation/fdl-using.html
+share/doc/bonobo-activation/fdl.html
+share/doc/bonobo-activation/home.png
+share/doc/bonobo-activation/index.html
+share/doc/bonobo-activation/index.sgml
+share/doc/bonobo-activation/left.png
+share/doc/bonobo-activation/migrating.html
+share/doc/bonobo-activation/query-langage.html
+share/doc/bonobo-activation/query-syntax.html
+share/doc/bonobo-activation/right.png
+share/doc/bonobo-activation/server-arch.html
+share/doc/bonobo-activation/server-xml-reference.html
+share/doc/bonobo-activation/tutorial.html
+share/doc/bonobo-activation/up.png
 share/doc/libbonobo/debugging.html
 share/doc/libbonobo/factories.html
 share/doc/libbonobo/general.html
@@ -81,7 +116,6 @@ share/doc/libbonobo/libbonobo-bonobo-i18n.html
 share/doc/libbonobo/libbonobo-bonobo-item-container.html
 share/doc/libbonobo/libbonobo-bonobo-item-handler.html
 share/doc/libbonobo/libbonobo-bonobo-listener.html
-share/doc/libbonobo/libbonobo-bonobo-macros.html
 share/doc/libbonobo/libbonobo-bonobo-main.html
 share/doc/libbonobo/libbonobo-bonobo-moniker-context.html
 share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html
@@ -103,7 +137,6 @@ share/doc/libbonobo/libbonobo-bonobo-storage.html
 share/doc/libbonobo/libbonobo-bonobo-stream-client.html
 share/doc/libbonobo/libbonobo-bonobo-stream-memory.html
 share/doc/libbonobo/libbonobo-bonobo-types.html
-share/doc/libbonobo/libbonobo-bonobo-xobject.html
 share/doc/libbonobo/libbonobo-faq.html
 share/doc/libbonobo/libbonobo.devhelp
 share/doc/libbonobo/misc.html
@@ -118,6 +151,7 @@ share/doc/libbonobo/properties.html
 share/doc/libbonobo/property-bags.html
 share/doc/libbonobo/refcounting.html
 share/doc/libbonobo/right.png
+share/doc/libbonobo/running-context.png
 share/doc/libbonobo/storage.png
 share/doc/libbonobo/stream.png
 share/doc/libbonobo/streams.html
@@ -153,6 +187,7 @@ share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/da/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/de/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/el/LC_MESSAGES/libbonobo-2.0.mo
@@ -170,6 +205,7 @@ share/locale/id/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/li/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo
@@ -199,6 +235,7 @@ share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrm share/idl/bonobo-activation-2.0
 @dirrm share/idl/bonobo-2.0
+@dirrm share/doc/bonobo-activation
 @dirrm share/doc/libbonobo
 @dirrm libdata/bonobo/servers
 @dirrm libdata/bonobo