summaryrefslogtreecommitdiff
path: root/devel/gnomevfs2/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gnomevfs2/files')
-rw-r--r--devel/gnomevfs2/files/patch-aa18
-rw-r--r--devel/gnomevfs2/files/patch-devel-docs::Makefile.in15
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c10
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c15
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c10
-rw-r--r--devel/gnomevfs2/files/patch-modules__http-neon-method.c21
-rw-r--r--devel/gnomevfs2/files/patch-modules_bzip2-method.c11
-rw-r--r--devel/gnomevfs2/files/patch-modules_sftp-method.c12
8 files changed, 29 insertions, 83 deletions
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 0f976d16a464..4b5c0cfaea3d 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Wed Oct 5 10:56:02 2005
-+++ configure Mon Nov 28 13:34:48 2005
-@@ -23119,6 +23119,8 @@
+--- configure.orig Mon Nov 14 11:43:13 2005
++++ configure Mon Nov 28 13:52:39 2005
+@@ -23123,6 +23123,8 @@
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23201,6 +23203,7 @@
+@@ -23205,6 +23207,7 @@
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +17,7 @@
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -24292,6 +24295,7 @@
+@@ -24296,6 +24299,7 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -25,7 +25,7 @@
have_ngettext=yes
else
echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -33558,7 +33562,7 @@
+@@ -33559,7 +33563,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -34,7 +34,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36964,6 +36968,9 @@
+@@ -37107,6 +37111,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44,7 +44,7 @@
#include <sys/statfs.h>
#include <sys/fstyp.h>
_ACEOF
-@@ -37005,6 +37012,9 @@
+@@ -37148,6 +37155,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -54,7 +54,7 @@
#include <sys/statfs.h>
#include <sys/vmount.h>
_ACEOF
-@@ -38439,6 +38449,7 @@
+@@ -38604,6 +38614,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index 5d2778e291bf..000000000000
--- a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
- $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $
-
---- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1
-+++ devel-docs/Makefile.in 2002/02/16 16:45:47
-@@ -168,7 +168,7 @@
- TEXT_FILES = gnome-vfs-mime-type-handling.txt
-
-
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- doc_DATA =
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c
new file mode 100644
index 000000000000..1636ca99d4df
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-address.c.orig Wed Apr 12 10:16:28 2006
++++ libgnomevfs/gnome-vfs-address.c Thu Apr 20 09:52:12 2006
+@@ -32,6 +32,7 @@
+ #include <sys/types.h>
+
+ #ifndef G_OS_WIN32
++#include <sys/socket.h>
+ #include <sys/select.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
deleted file mode 100644
index 6e3660c845b0..000000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005
-+++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005
-@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er
- switch (error) {
-
- case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
-+#ifdef EAI_NODATA
- #ifdef EAI_ADDRFAMILY
- case EAI_ADDRFAMILY:
- #endif
- case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#endif
- #ifdef EAI_SYSTEM
- case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- #endif
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
new file mode 100644
index 000000000000..dc1259ac425f
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 14 22:20:23 2005
++++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 14 22:20:43 2005
+@@ -25,6 +25,7 @@
+
+ #include <sys/types.h>
+ #include <errno.h>
++#include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <glib.h>
diff --git a/devel/gnomevfs2/files/patch-modules__http-neon-method.c b/devel/gnomevfs2/files/patch-modules__http-neon-method.c
deleted file mode 100644
index 77e14080f5b0..000000000000
--- a/devel/gnomevfs2/files/patch-modules__http-neon-method.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- modules/http-neon-method.c.orig Wed Jan 25 23:15:42 2006
-+++ modules/http-neon-method.c Wed Jan 25 23:17:47 2006
-@@ -1908,9 +1908,7 @@
- }
- }
-
--
- result = resolve_result (res, req);
-- ne_request_destroy (req);
-
- if (result == GNOME_VFS_OK) {
- const char *name;
-@@ -1929,6 +1927,8 @@
- }
-
- }
-+
-+ ne_request_destroy (req);
-
- return result;
- }
diff --git a/devel/gnomevfs2/files/patch-modules_bzip2-method.c b/devel/gnomevfs2/files/patch-modules_bzip2-method.c
deleted file mode 100644
index a1fd982c28bd..000000000000
--- a/devel/gnomevfs2/files/patch-modules_bzip2-method.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/bzip2-method.c.orig Wed Apr 13 21:58:54 2005
-+++ modules/bzip2-method.c Mon Nov 28 15:09:59 2005
-@@ -435,7 +435,7 @@
-
- if (bzip2_handle->last_bz_result != BZ_OK) {
- if (bzip2_handle->last_bz_result == BZ_STREAM_END)
-- return GNOME_VFS_OK;
-+ return GNOME_VFS_ERROR_EOF;
- else
- return result_from_bz_result (bzip2_handle->last_bz_result);
- } else if (bzip2_handle->last_vfs_result != GNOME_VFS_OK) {
diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c
deleted file mode 100644
index e1255db179c1..000000000000
--- a/devel/gnomevfs2/files/patch-modules_sftp-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/sftp-method.c.orig Tue May 11 01:53:30 2004
-+++ modules/sftp-method.c Tue May 11 01:54:07 2004
-@@ -1081,7 +1081,9 @@
- if (io_status == G_IO_STATUS_NORMAL) {
- buffer[len] = 0;
- if (g_str_has_suffix (buffer, "password: ") ||
-+ g_str_has_suffix (buffer, "password:") ||
- g_str_has_suffix (buffer, "Password: ") ||
-+ g_str_has_suffix (buffer, "Password:") ||
- g_str_has_prefix (buffer, "Enter passphrase for key")) {
- if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
- g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);