Update all components of the GNOME 2.0 to the versions included into GNOME

2.0-beta release.

7 files changed, 25 insertions, 47 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 04c826d519e0..f77f38ae5026 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	bonobo-activation
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,6 +22,7 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 9755af015b37..0ad288051923 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.3.tar.bz2) = e10f9788c1d1df646d795cc813be0bdd
+MD5 (gnome2/bonobo-activation-0.9.4.tar.bz2) = 8ba26b622b2e459d19e43a8099987415
diff --git a/devel/bonobo-activation/files/patch-intltool-merge.in b/devel/bonobo-activation/files/patch-intltool-merge.in
new file mode 100644
index 000000000000..4a5138a8ddda
--- /dev/null
+++ b/devel/bonobo-activation/files/patch-intltool-merge.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- intltool-merge.in	2002/02/27 09:18:26	1.1
++++ intltool-merge.in	2002/02/27 09:18:34
+@@ -287,7 +287,7 @@
+             if (lc $encoding eq "utf-8") {
+                 open PO_FILE, "<$po_file";	
+             } else {
+-                open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
++                open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+             }
+         } else {
+             open PO_FILE, "<$po_file";	
diff --git a/devel/bonobo-activation/files/patch-po::Makefile.in.in b/devel/bonobo-activation/files/patch-po::Makefile.in.in
deleted file mode 100644
index 6da522a4a8c5..000000000000
--- a/devel/bonobo-activation/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/02/13 17:45:32	1.1
-+++ po/Makefile.in.in	2002/02/13 17:45:43
-@@ -104,7 +104,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/devel/bonobo-activation/files/patch-server::activation-context-query-parser.y b/devel/bonobo-activation/files/patch-server::activation-context-query-parser.y
deleted file mode 100644
index 5551c815ffca..000000000000
--- a/devel/bonobo-activation/files/patch-server::activation-context-query-parser.y
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- server/activation-context-query-parser.y	2002/02/13 17:42:46	1.1
-+++ server/activation-context-query-parser.y	2002/02/13 17:42:56
-@@ -23,7 +23,7 @@
-  */
- 
- %{
--#define YYSTACK_USE_ALLOCA
-+#define YYSTACK_USE_ALLOCA 1
- 
- #include "activation-context-query.h"
- 
diff --git a/devel/bonobo-activation/files/patch-xml-i18n-merge.in b/devel/bonobo-activation/files/patch-xml-i18n-merge.in
deleted file mode 100644
index cbcf71f4bb50..000000000000
--- a/devel/bonobo-activation/files/patch-xml-i18n-merge.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- xml-i18n-merge.in	2002/02/13 21:58:17	1.1
-+++ xml-i18n-merge.in	2002/02/13 21:58:25
-@@ -232,7 +232,7 @@
- 
-         if ($UTF8_ARG) {
-             my $encoding = get_po_encoding($po_file);
--            open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
-+            open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
-         } else {
-             open PO_FILE, "<$po_file";	
-         }
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index f1c2f7d35fee..f34cbe33ad04 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -19,7 +19,7 @@ include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
 lib/libbonobo-activation.so
-lib/libbonobo-activation.so.3
+lib/libbonobo-activation.so.4
 libdata/bonobo/servers/Bonobo_CosNaming_NamingContext.server
 libdata/bonobo/servers/broken.server
 libdata/bonobo/servers/empty.server
@@ -31,6 +31,7 @@ share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
 share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl
 share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
 share/locale/az/LC_MESSAGES/bonobo-activation.mo
+share/locale/bg/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
@@ -43,10 +44,13 @@ share/locale/hu/LC_MESSAGES/bonobo-activation.mo
 share/locale/it/LC_MESSAGES/bonobo-activation.mo
 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/ms/LC_MESSAGES/bonobo-activation.mo
 share/locale/nl/LC_MESSAGES/bonobo-activation.mo
 share/locale/nn/LC_MESSAGES/bonobo-activation.mo
 share/locale/no/LC_MESSAGES/bonobo-activation.mo
 share/locale/pl/LC_MESSAGES/bonobo-activation.mo
+share/locale/pt/LC_MESSAGES/bonobo-activation.mo
 share/locale/pt_BR/LC_MESSAGES/bonobo-activation.mo
 share/locale/ro/LC_MESSAGES/bonobo-activation.mo
 share/locale/ru/LC_MESSAGES/bonobo-activation.mo
@@ -56,8 +60,10 @@ 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/zh_CN/LC_MESSAGES/bonobo-activation.mo
 share/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo
 @dirrm share/idl/bonobo-activation-2.0
+@dirrm share/doc/bonobo-activation
 @dirrm libdata/bonobo/servers
 @dirrm libdata/bonobo
 @dirrm include/bonobo-activation-2.0/bonobo-activation