5 files changed, 19 insertions, 23 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 304121b4be49..1ac284dfce16 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bonobo-activation
-PORTVERSION=	2.2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -15,7 +14,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An object activation framework for GNOME 2.0
+COMMENT=	An object activation framework for GNOME 2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 97bae157925e..64a9d228fa0c 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-2.2.1.1.tar.bz2) = 165c2652ec07ca5da5b9e95468722487
+MD5 (gnome2/bonobo-activation-2.2.2.tar.bz2) = fc2c20771ef3f487b1cd67a8de5a7142
diff --git a/devel/bonobo-activation/files/patch-idl_Bonobo_GenericFactory.idl b/devel/bonobo-activation/files/patch-idl_Bonobo_GenericFactory.idl
deleted file mode 100644
index 3efed7eb8ae0..000000000000
--- a/devel/bonobo-activation/files/patch-idl_Bonobo_GenericFactory.idl
+++ /dev/null
@@ -1,8 +0,0 @@
---- idl/Bonobo_GenericFactory.idl.orig	Wed May 21 14:14:14 2003
-+++ idl/Bonobo_GenericFactory.idl	Wed May 21 14:15:05 2003
-@@ -44,3 +44,5 @@
- #pragma inhibit pop
- #endif
- #endif
-+
-+#endif
diff --git a/devel/bonobo-activation/files/patch-server::Makefile.in b/devel/bonobo-activation/files/patch-server::Makefile.in
index 0a624f6ee911..54f84e6e043b 100644
--- a/devel/bonobo-activation/files/patch-server::Makefile.in
+++ b/devel/bonobo-activation/files/patch-server::Makefile.in
@@ -1,11 +1,11 @@
---- server/Makefile.in.orig	Fri Mar 14 19:52:50 2003
-+++ server/Makefile.in	Fri Mar 14 19:58:12 2003
-@@ -152,7 +152,7 @@
- libexec_PROGRAMS = bonobo-activation-server
- noinst_PROGRAMS = test-performance
- 
--INCLUDES =  	-I$(top_srcdir) 				-I$(top_builddir) 				-I$(top_builddir)/bonobo-activation		-I$(top_srcdir)/bonobo-activation		-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\"         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" 	$(SERVER_CFLAGS)				-DSERVER_CONFDIR=\"$(sysconfdir)\"		-DG_DISABLE_DEPRECATED				$(NULL)
-+INCLUDES =  	-I$(top_srcdir) 				-I$(top_builddir) 				-I$(top_builddir)/bonobo-activation		-I$(top_srcdir)/bonobo-activation		-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\"         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" 	$(SERVER_CFLAGS)				-DSERVER_CONFDIR=\"$(sysconfdir)\"		-DG_DISABLE_DEPRECATED				$(NULL)
- 
- 
- bonobo_activation_server_SOURCES =  	activation-server-corba-extensions.c				activation-server-corba-extensions.h				activation-context-query.h					activation-context-query.c					activation-context-query-lexer.c				activation-context-query-parser.c				activation-context-query-parser.h				activation-context-corba.c					object-directory-corba.c					object-directory-load.c						object-directory-activate.c					object-directory-config-file.c					object-directory-config-file.h					activation-server-main.c					server.h
+--- server/Makefile.in.orig	Mon May 26 20:51:01 2003
++++ server/Makefile.in	Mon May 26 20:51:23 2003
+@@ -169,7 +169,7 @@
+ 	-I$(top_builddir) 			\
+ 	-I$(top_builddir)/bonobo-activation	\
+ 	-I$(top_srcdir)/bonobo-activation	\
+-	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \
++	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \
+         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
+ 	$(SERVER_CFLAGS)			\
+ 	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index 738836e0af29..ffea3cb4286b 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -78,6 +78,7 @@ share/locale/cs/LC_MESSAGES/bonobo-activation.mo
 share/locale/da/LC_MESSAGES/bonobo-activation.mo
 share/locale/de/LC_MESSAGES/bonobo-activation.mo
 share/locale/el/LC_MESSAGES/bonobo-activation.mo
+share/locale/eo/LC_MESSAGES/bonobo-activation.mo
 share/locale/es/LC_MESSAGES/bonobo-activation.mo
 share/locale/fa/LC_MESSAGES/bonobo-activation.mo
 share/locale/fi/LC_MESSAGES/bonobo-activation.mo
@@ -93,6 +94,7 @@ share/locale/ja/LC_MESSAGES/bonobo-activation.mo
 share/locale/ko/LC_MESSAGES/bonobo-activation.mo
 share/locale/lv/LC_MESSAGES/bonobo-activation.mo
 share/locale/mk/LC_MESSAGES/bonobo-activation.mo
+share/locale/ml/LC_MESSAGES/bonobo-activation.mo
 share/locale/mn/LC_MESSAGES/bonobo-activation.mo
 share/locale/ms/LC_MESSAGES/bonobo-activation.mo
 share/locale/nl/LC_MESSAGES/bonobo-activation.mo
@@ -106,12 +108,15 @@ share/locale/ru/LC_MESSAGES/bonobo-activation.mo
 share/locale/sk/LC_MESSAGES/bonobo-activation.mo
 share/locale/sl/LC_MESSAGES/bonobo-activation.mo
 share/locale/sq/LC_MESSAGES/bonobo-activation.mo
+share/locale/sr/LC_MESSAGES/bonobo-activation.mo
+share/locale/sr@Latn/LC_MESSAGES/bonobo-activation.mo
 share/locale/sv/LC_MESSAGES/bonobo-activation.mo
 share/locale/ta/LC_MESSAGES/bonobo-activation.mo
 share/locale/tr/LC_MESSAGES/bonobo-activation.mo
 share/locale/uk/LC_MESSAGES/bonobo-activation.mo
 share/locale/vi/LC_MESSAGES/bonobo-activation.mo
 share/locale/wa/LC_MESSAGES/bonobo-activation.mo
+share/locale/yi/LC_MESSAGES/bonobo-activation.mo
 share/locale/zh_CN/LC_MESSAGES/bonobo-activation.mo
 share/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo
 @dirrm share/idl/bonobo-activation-2.0