5 files changed, 18 insertions, 20 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 1dcc21ed06cf..569f4bbaf759 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bonobo-activation
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 88ac38c20274..6e72ac85a55e 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-1.0.2.tar.bz2) = 12e959429016c59365b4cd4bb9746bd0
+MD5 (gnome2/bonobo-activation-1.0.3.tar.bz2) = 79b65c0e35fa22eb2b73346b7490f25f
diff --git a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
index cf1477a63af6..103422530c6f 100644
--- a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
+++ b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
@@ -1,10 +1,10 @@
---- bonobo-activation/bonobo-activation-fork-server.c.orig	Tue Mar 12 09:23:47 2002
-+++ bonobo-activation/bonobo-activation-fork-server.c	Tue Apr  2 18:27:40 2002
-@@ -342,6 +342,8 @@
+--- bonobo-activation/bonobo-activation-fork-server.c.orig	Wed Jul 24 16:46:27 2002
++++ bonobo-activation/bonobo-activation-fork-server.c	Wed Jul 24 16:47:00 2002
+@@ -349,6 +349,8 @@
  	} else if ((childpid = fork ())) {
  		_exit (0);	/* de-zombifier process, just exit */
  	} else {
-+		sigprocmask (SIG_SETMASK, &omask, NULL);
++	    	sigprocmask (SIG_SETMASK, &omask, NULL);
 +
                  if (display != NULL) {
                          bonobo_activation_setenv ("DISPLAY", display);
diff --git a/devel/bonobo-activation/files/patch-server::Makefile.in b/devel/bonobo-activation/files/patch-server::Makefile.in
index 743d08ba7ecb..49683926cdff 100644
--- a/devel/bonobo-activation/files/patch-server::Makefile.in
+++ b/devel/bonobo-activation/files/patch-server::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- server/Makefile.in	2002/05/09 20:49:39	1.1
-+++ server/Makefile.in	2002/05/09 20:50:27
-@@ -143,7 +143,7 @@
- 
- bin_PROGRAMS = bonobo-activation-server activation-client
- 
--INCLUDES =  	-I$(top_srcdir) 				-I$(top_builddir) 				-I$(top_builddir)/bonobo-activation		-I$(top_srcdir)/bonobo-activation		-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" 	-DSERVER_LOCALEDIR=\""$(datadir)/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=\""$(datadir)/locale"\" 	$(SERVER_CFLAGS)				-DSERVER_CONFDIR=\"$(sysconfdir)\"		-DG_DISABLE_DEPRECATED				$(NULL)
+--- server/Makefile.in.orig	Wed Jul 24 16:56:33 2002
++++ server/Makefile.in	Wed Jul 24 16:56:52 2002
+@@ -147,7 +147,7 @@
+ bin_PROGRAMS = activation-client
+ libexec_PROGRAMS = bonobo-activation-server
+ 
+-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
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index d8a6d29cf364..b27389f39a2b 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -1,8 +1,6 @@
 bin/activation-client
 bin/bonobo-activation-empty-server
 bin/bonobo-activation-run-query
-bin/bonobo-activation-server
-bin/bonobo-activation-sysconf
 bin/bonobo-slay
 etc/bonobo-activation/bonobo-activation-config.xml
 include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h
@@ -26,6 +24,8 @@ libdata/bonobo/servers/broken.server
 libdata/bonobo/servers/empty.server
 libdata/bonobo/servers/plugin.server
 libdata/pkgconfig/bonobo-activation-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
@@ -75,6 +75,7 @@ share/locale/fi/LC_MESSAGES/bonobo-activation.mo
 share/locale/fr/LC_MESSAGES/bonobo-activation.mo
 share/locale/ga/LC_MESSAGES/bonobo-activation.mo
 share/locale/gl/LC_MESSAGES/bonobo-activation.mo
+share/locale/hi/LC_MESSAGES/bonobo-activation.mo
 share/locale/hu/LC_MESSAGES/bonobo-activation.mo
 share/locale/it/LC_MESSAGES/bonobo-activation.mo
 share/locale/ja/LC_MESSAGES/bonobo-activation.mo