diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-04-06 22:37:43 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-04-06 22:37:43 +0000 |
| commit | 491c51f8077d2845e9012593c98069a209fbae1b (patch) | |
| tree | 7e59886420e57f582d1404611b9fefb35c887faf /devel/bonobo-activation | |
| parent | Update to the Sun JDK 1.3.1.03 for Linux/i386. (diff) | |
Update to GNOME 2.0 beta3.
Approved by: sobomax
Diffstat (limited to 'devel/bonobo-activation')
4 files changed, 20 insertions, 26 deletions
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile index b6e72cf12bb2..0ad69702d5af 100644 --- a/devel/bonobo-activation/Makefile +++ b/devel/bonobo-activation/Makefile @@ -6,10 +6,10 @@ # PORTNAME= bonobo-activation -PORTVERSION= 0.9.5 +PORTVERSION= 0.9.6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta2 +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo index 622d125f2cd0..4ce00b6fc551 100644 --- a/devel/bonobo-activation/distinfo +++ b/devel/bonobo-activation/distinfo @@ -1 +1 @@ -MD5 (gnome2/bonobo-activation-0.9.5.tar.bz2) = 6dc24bac530afc7e306913a7b67e8039 +MD5 (gnome2/bonobo-activation-0.9.6.tar.bz2) = db38496928b7a7fff0b0cce32d1fc4c9 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 ac381550b930..cf1477a63af6 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,14 +1,11 @@ - -$FreeBSD$ - ---- bonobo-activation/bonobo-activation-fork-server.c 2002/02/14 01:06:52 1.1 -+++ bonobo-activation/bonobo-activation-fork-server.c 2002/02/14 01:07:07 -@@ -270,6 +270,8 @@ +--- 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 @@ } else if ((childpid = fork ())) { _exit (0); /* de-zombifier process, just exit */ } else { + sigprocmask (SIG_SETMASK, &omask, NULL); + - if (display) - bonobo_activation_setenv ("DISPLAY", display); - if (od_iorstr) + if (display != NULL) { + bonobo_activation_setenv ("DISPLAY", display); + } diff --git a/devel/bonobo-activation/files/patch-utils::bonobo-slay.in b/devel/bonobo-activation/files/patch-utils::bonobo-slay.in index 3aa2e8eec3c0..44212a0418a1 100644 --- a/devel/bonobo-activation/files/patch-utils::bonobo-slay.in +++ b/devel/bonobo-activation/files/patch-utils::bonobo-slay.in @@ -1,24 +1,21 @@ - -$FreeBSD$ - ---- utils/bonobo-slay.in 2002/02/13 17:51:37 1.1 -+++ utils/bonobo-slay.in 2002/02/13 17:52:04 -@@ -51,15 +51,15 @@ +--- utils/bonobo-slay.in.orig Mon Mar 11 12:16:43 2002 ++++ utils/bonobo-slay.in Tue Apr 2 18:30:30 2002 +@@ -56,15 +56,15 @@ - # get OAF files + # get Bonobo files # --@oaf_dirs = ( "@prefix@/lib/bonobo/servers" ); -+@oaf_dirs = ( "@prefix@/libdata/bonobo/servers" ); - foreach $dir (split(':', $ENV{'OAF_INFO_PATH'})) { +-@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" ); ++@bonobo_dirs = ( "@prefix@/libdata/bonobo/servers" ); + foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) { if (-d $dir) { - push @oaf_dirs, $dir; + push @bonobo_dirs, $dir; } } - foreach $dir (split(':', $ENV{'GNOME_PATH'})) { + foreach $dir (split(':', $ENV{'GNOME2_PATH'})) { - if (-d "$dir/lib/bonobo/servers") { -- push @oaf_dirs, "$dir/lib/bonobo/servers"; +- push @bonobo_dirs, "$dir/lib/bonobo/servers"; + if (-d "$dir/libdata/bonobo/servers") { -+ push @oaf_dirs, "$dir/libdata/bonobo/servers"; ++ push @bonobo_dirs, "$dir/libdata/bonobo/servers"; } } |