Fixed a build error on Solaris, where the function login_tty does not

exist. The code only checked for HAVE_UTMP_H, not for HAVE_LOGIN_TTY.

4 files changed, 44 insertions, 12 deletions

diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index fb71d040c62..8902f5050fe 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2006/04/02 18:58:20 jmmv Exp $
+$NetBSD: distinfo,v 1.51 2006/04/27 18:37:24 rillig Exp $
 
 SHA1 (gnome-vfs-2.14.0.tar.bz2) = 32ca078efe4bd8785d4f01f210a465c460966db5
 RMD160 (gnome-vfs-2.14.0.tar.bz2) = 8f5eb53c1458a514af12edcc902f74d0121b50e9
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
 SHA1 (patch-ac) = 5b8ffa3994440c09da0b2fe53b05ccb333b0778e
 SHA1 (patch-ad) = 5df81a0bf979f710912b42883658c10d198cca87
-SHA1 (patch-ae) = 89e87a11588f94ec1f97b0ad35bc1fe16885413f
+SHA1 (patch-ae) = 841dd04980013448d478bfbe61cbc9e4ac0a0376
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
 SHA1 (patch-ah) = 0927ade189c14472e5768b7e4775854de519f19c
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
@@ -16,8 +16,9 @@ SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
 SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390
 SHA1 (patch-ap) = 98ad7700d01007510467e2ae4ee8554f54f15320
 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
-SHA1 (patch-ar) = edb0363525d023d14b43aabd89ccebe4d6695a8e
+SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4
 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
 SHA1 (patch-aw) = 22801eb932f8f7e7256be3863fcd5273a7a5213e
 SHA1 (patch-ax) = 06a104c8ae3caf01a2bf6899cd2b85980c0bb26d
 SHA1 (patch-az) = 50d74fbf4973a5f6366a20b89e17bab450e73784
+SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51
diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae
index 09ef5903d1b..37d2d4f5df2 100644
--- a/sysutils/gnome-vfs2/patches/patch-ae
+++ b/sysutils/gnome-vfs2/patches/patch-ae
@@ -1,10 +1,19 @@
-$NetBSD: patch-ae,v 1.9 2006/04/02 18:58:20 jmmv Exp $
+$NetBSD: patch-ae,v 1.10 2006/04/27 18:37:24 rillig Exp $
 
 The following bug covers the removal of the gnome-mime-data dependency:
 http://bugzilla.gnome.org/show_bug.cgi?id=336952
 
---- configure.orig	2006-03-13 10:26:09.000000000 +0100
-+++ configure
+--- configure.orig	Mon Mar 13 10:26:09 2006
++++ configure	Wed Apr 26 16:55:02 2006
+@@ -25487,7 +25487,7 @@ fi
+ 
+ 
+ 
+-for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod
++for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
 @@ -26424,9 +26424,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
diff --git a/sysutils/gnome-vfs2/patches/patch-ar b/sysutils/gnome-vfs2/patches/patch-ar
index fbf399f2a86..a81054f2ac2 100644
--- a/sysutils/gnome-vfs2/patches/patch-ar
+++ b/sysutils/gnome-vfs2/patches/patch-ar
@@ -1,7 +1,16 @@
-$NetBSD: patch-ar,v 1.2 2006/03/30 21:07:48 jmmv Exp $
+$NetBSD: patch-ar,v 1.3 2006/04/27 18:37:24 rillig Exp $
 
---- libgnomevfs/gnome-vfs-pty.c.orig	2005-11-22 15:10:17.000000000 +0100
-+++ libgnomevfs/gnome-vfs-pty.c
+--- libgnomevfs/gnome-vfs-pty.c.orig	Tue Nov 22 15:10:17 2005
++++ libgnomevfs/gnome-vfs-pty.c	Wed Apr 26 23:15:08 2006
+@@ -306,7 +306,7 @@ _gnome_vfs_pty_run_on_pty(int fd, gboole
+ 		chdir(directory);
+ 	}
+ 
+-#ifdef HAVE_UTMP_H
++#ifdef HAVE_LOGIN_TTY
+ 	/* This sets stdin, stdout, stderr to the socket */	
+ 	if (login && login_tty (fd) == -1) {
+ 		g_printerr ("mount child process login_tty failed: %s\n", strerror (errno));
 @@ -629,6 +629,7 @@ _gnome_vfs_pty_set_size(int master, int 
  static char *
  _gnome_vfs_pty_ptsname(int master)
@@ -50,11 +59,11 @@ $NetBSD: patch-ar,v 1.2 2006/03/30 21:07:48 jmmv Exp $
  #ifdef HAVE_UNLOCKPT
  	return unlockpt(fd);
  #elif defined(TIOCSPTLCK)
-@@ -721,6 +726,7 @@ _gnome_vfs_pty_unlockpt(int fd)
+@@ -720,6 +725,7 @@ _gnome_vfs_pty_unlockpt(int fd)
+ 	return ioctl(fd, TIOCSPTLCK, &zero);
  #else
  	return -1;
- #endif
 +#endif
+ #endif
  }
  
- static int
diff --git a/sysutils/gnome-vfs2/patches/patch-ba b/sysutils/gnome-vfs2/patches/patch-ba
new file mode 100644
index 00000000000..86131524fad
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2006/04/27 18:37:24 rillig Exp $
+
+--- config.h.in.orig	2006-03-13 10:48:56.000000000 +0100
++++ config.h.in	2006-04-27 20:33:25.416810500 +0200
+@@ -208,6 +208,8 @@
+ /* Define to 1 if you have the `lseek64' function. */
+ #undef HAVE_LSEEK64
+ 
++#undef HAVE_LOGIN_TTY
++
+ /* Define to 1 if you have the `mbrtowc' function. */
+ #undef HAVE_MBRTOWC
+