head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.26
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.24
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.22
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.20
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.18
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.16
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.14
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.12
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.10
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.8
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.6
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.4
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.2
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.2.0.12
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.10
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.8
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.6
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.4
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.2
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.1.1.1.0.24
	pkgsrc-2005Q3-base:1.1.1.1
	pkgsrc-2005Q2:1.1.1.1.0.22
	pkgsrc-2005Q2-base:1.1.1.1
	pkgsrc-2005Q1:1.1.1.1.0.20
	pkgsrc-2005Q1-base:1.1.1.1
	pkgsrc-2004Q4:1.1.1.1.0.18
	pkgsrc-2004Q4-base:1.1.1.1
	pkgsrc-2004Q3:1.1.1.1.0.16
	pkgsrc-2004Q3-base:1.1.1.1
	pkgsrc-2004Q2:1.1.1.1.0.14
	pkgsrc-2004Q2-base:1.1.1.1
	pkgsrc-2004Q1:1.1.1.1.0.12
	pkgsrc-2004Q1-base:1.1.1.1
	pkgsrc-2003Q4:1.1.1.1.0.10
	pkgsrc-2003Q4-base:1.1.1.1
	netbsd-1-6-1:1.1.1.1.0.6
	netbsd-1-6-1-base:1.1.1.1
	netbsd-1-6:1.1.1.1.0.8
	netbsd-1-6-RELEASE-base:1.1.1.1
	pkgviews:1.1.1.1.0.4
	pkgviews-base:1.1.1.1
	buildlink2:1.1.1.1.0.2
	buildlink2-base:1.1.1.1
	netbsd-1-5-PATCH003:1.1.1.1
	netbsd-1-5-PATCH001:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2007.05.20.15.48.25;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2005.11.04.22.30.34;	author dbj;	state Exp;
branches;
next	1.1;

1.1
date	2000.11.25.13.57.10;	author rh;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.11.25.13.57.10;	author rh;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove remaining gnome1-libs dependencies from pkgsrc.
@
text
@$NetBSD: patch-ac,v 1.2 2005/11/04 22:30:34 dbj Exp $

--- modules/file-method.c.orig	2002-03-14 22:33:01.000000000 -0500
+++ modules/file-method.c
@@@@ -35,9 +35,12 @@@@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/param.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <utime.h>
@@@@ -767,9 +770,15 @@@@ read_directory (DirectoryHandle *handle,
 		filter_needs = GNOME_VFS_DIRECTORY_FILTER_NEEDS_NOTHING;
 	}
 
+#if (defined(BSD) && BSD >= 199306)
+	if ((result = readdir (handle->dir)) != NULL) {
+		*handle->current_entry = *result;
+	}
+#else
 	if (readdir_r (handle->dir, handle->current_entry, &result) != 0) {
 		return gnome_vfs_result_from_errno ();
 	}
+#endif
 	
 	if (result == NULL) {
 		return GNOME_VFS_ERROR_EOF;
@@@@ -1099,9 +1108,15 @@@@ find_trash_in_one_hierarchy_level (const
 
 	item_buffer = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
 	for (;;) {
+#if (defined(BSD) && BSD >= 199306)
+		if ((item = readdir (directory)) != NULL) {
+			*item_buffer = *item;
+		}
+#else
 		if (readdir_r (directory, item_buffer, &item) != 0 || item == NULL) {
 			break;
 		}
+#endif
 
 		if (gnome_vfs_context_check_cancellation (context))
 			break;
@


1.2
log
@only include malloc.h if HAVE_MALLOC_H is defined
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1.1.1 2000/11/25 13:57:10 rh Exp $
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- modules/file-method.c.orig	Thu Nov 16 07:57:37 2000
d5 5
a9 1
@@@@ -37,6 +37,7 @@@@
d11 1
d18 1
a18 1
@@@@ -723,9 +724,15 @@@@
d34 1
a34 1
@@@@ -1054,9 +1061,15 @@@@
@


1.1.1.1
log
@Initial import of gnome-vfs-0.4.1, the GNOME virtual file system.
@
text
@@