[pkgsrc/trunk]: pkgsrc fixes for darwin

[danw <danw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4666e25cdd6
branches:  trunk
changeset: 475184:e4666e25cdd6
user:      danw <danw%pkgsrc.org@localhost>
date:      Tue May 11 12:30:15 2004 +0000

description:
fixes for darwin

diffstat:

 sysutils/nautilus/distinfo         |   5 +++--
 sysutils/nautilus/patches/patch-ah |  14 +++++++++-----
 sysutils/nautilus/patches/patch-ai |  16 ++++++++++++++++
 x11/gnome-desktop/distinfo         |   4 +++-
 x11/gnome-desktop/patches/patch-af |  16 ++++++++++++++++
 x11/gnome-desktop/patches/patch-ag |  16 ++++++++++++++++
 6 files changed, 63 insertions(+), 8 deletions(-)

diffs (116 lines):

diff -r 7242ca92d82b -r e4666e25cdd6 sysutils/nautilus/distinfo
--- a/sysutils/nautilus/distinfo        Tue May 11 12:28:34 2004 +0000
+++ b/sysutils/nautilus/distinfo        Tue May 11 12:30:15 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/05/03 18:20:30 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2004/05/11 12:30:15 danw Exp $
 
 SHA1 (nautilus-2.6.1.tar.bz2) = 0b00ee9d74b22ff0475a13e2e197884557b6da44
 Size (nautilus-2.6.1.tar.bz2) = 5610905 bytes
@@ -7,4 +7,5 @@
 SHA1 (patch-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124
 SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057
 SHA1 (patch-ag) = e8d2e55efb32bf0b684ba7a67c177bf849ae9045
-SHA1 (patch-ah) = 57fbbadae0aa47014645d72fd0da9f9ce145d8de
+SHA1 (patch-ah) = 081da3e950f04573e136b6ed8c1ce0d057e803c5
+SHA1 (patch-ai) = 978519b6c3e3169030fda66d5f8d167af103a582
diff -r 7242ca92d82b -r e4666e25cdd6 sysutils/nautilus/patches/patch-ah
--- a/sysutils/nautilus/patches/patch-ah        Tue May 11 12:28:34 2004 +0000
+++ b/sysutils/nautilus/patches/patch-ah        Tue May 11 12:30:15 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/02/21 06:42:37 xtraeme Exp $
+$NetBSD: patch-ah,v 1.2 2004/05/11 12:30:15 danw Exp $
 
---- libnautilus-private/nautilus-emblem-utils.c.orig   Sun Feb  1 13:22:13 2004
-+++ libnautilus-private/nautilus-emblem-utils.c        Sun Feb  1 13:22:46 2004
-@@ -23,7 +23,9 @@
+--- libnautilus-private/nautilus-emblem-utils.c.orig   Thu Dec 18 12:19:39 2003
++++ libnautilus-private/nautilus-emblem-utils.c
+@@ -23,10 +23,12 @@
  */
  
  #include <config.h>
@@ -10,6 +10,10 @@
 +#ifdef __FreeBSD__
 +#include <sys/types.h>
 +#endif
++#include <time.h>
  #include <utime.h>
  #include <stdio.h>
- #include <time.h>
+-#include <time.h>
+ #include <unistd.h>
+ #include "nautilus-icon-factory.h"
+ #include <eel/eel-string.h>
diff -r 7242ca92d82b -r e4666e25cdd6 sysutils/nautilus/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/nautilus/patches/patch-ai        Tue May 11 12:30:15 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2004/05/11 12:30:15 danw Exp $
+
+--- libnautilus-private/nautilus-program-choosing.c.orig       Tue Apr 13 20:45:27 2004
++++ libnautilus-private/nautilus-program-choosing.c
+@@ -71,6 +71,11 @@ typedef struct {
+ 
+ static GHashTable *choose_application_hash_table, *choose_component_hash_table;
+ 
++#if defined(__APPLE__)
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ extern char **environ;
+ 
+ /* Cut and paste from gdkspawn-x11.c */
diff -r 7242ca92d82b -r e4666e25cdd6 x11/gnome-desktop/distinfo
--- a/x11/gnome-desktop/distinfo        Tue May 11 12:28:34 2004 +0000
+++ b/x11/gnome-desktop/distinfo        Tue May 11 12:30:15 2004 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/04/01 18:36:11 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2004/05/11 12:31:27 danw Exp $
 
 SHA1 (gnome-desktop-2.6.0.tar.bz2) = 1c067a2e76ca5db38bc80fce0920861ff375fe34
 Size (gnome-desktop-2.6.0.tar.bz2) = 1095481 bytes
 SHA1 (patch-ae) = 85ff31395a7d24693e3125ee5c180a075612207c
+SHA1 (patch-af) = 5add103655b1e2996ea041de59156196bbf6f180
+SHA1 (patch-ag) = 2b2b757a9ecd2ee6348a52f51c48749bd78f29e4
diff -r 7242ca92d82b -r e4666e25cdd6 x11/gnome-desktop/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-desktop/patches/patch-af        Tue May 11 12:30:15 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2004/05/11 12:31:27 danw Exp $
+
+--- libgnome-desktop/egg-spawn.c.orig  Tue Apr 13 08:49:36 2004
++++ libgnome-desktop/egg-spawn.c
+@@ -28,6 +28,11 @@
+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
++#if defined(__APPLE__)
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ extern char **environ;
+ 
+ /**
diff -r 7242ca92d82b -r e4666e25cdd6 x11/gnome-desktop/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-desktop/patches/patch-ag        Tue May 11 12:30:15 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2004/05/11 12:31:27 danw Exp $
+
+--- libgnome-desktop/gnome-desktop-item.c.orig Tue Apr 13 08:49:43 2004
++++ libgnome-desktop/gnome-desktop-item.c
+@@ -1396,6 +1396,11 @@ sn_error_trap_pop (SnDisplay *display,
+       gdk_error_trap_pop ();
+ }
+ 
++#if defined(__APPLE__)
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ extern char **environ;
+ 
+ static char **