diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-05-12 23:49:19 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-05-12 23:49:19 +0800 |
commit | 926382e09698007dc3472481164045c6b0b9754a (patch) | |
tree | d0ae60e8f02a2f6b230176c1f2dd549262359efb /devel/gvfs/files | |
parent | 42048341091e3810049dedfc96d4b312013ab048 (diff) | |
download | marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.gz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.zst marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.zip |
Post 2.30.1 commit clean up.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14135 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gvfs/files')
-rw-r--r-- | devel/gvfs/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | devel/gvfs/files/patch-client_Makefile.in | 11 | ||||
-rw-r--r-- | devel/gvfs/files/patch-client_gvfsfusedaemon.c | 12 | ||||
-rw-r--r-- | devel/gvfs/files/patch-configure | 29 | ||||
-rw-r--r-- | devel/gvfs/files/patch-daemon_gvfswritechannel.c | 10 | ||||
-rw-r--r-- | devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c | 14 |
6 files changed, 0 insertions, 86 deletions
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in deleted file mode 100644 index 658cccd6a..000000000 --- a/devel/gvfs/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2008-07-22 23:17:58.000000000 -0400 -+++ Makefile.in 2008-07-22 23:18:24.000000000 -0400 -@@ -269,7 +269,6 @@ SUBDIRS = \ - gconf \ - po \ - programs \ -- test \ - $(NULL) - - EXTRA_DIST = \ diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in deleted file mode 100644 index ffbfd5878..000000000 --- a/devel/gvfs/files/patch-client_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- client/Makefile.in.orig 2008-02-11 20:05:14.000000000 -0500 -+++ client/Makefile.in 2008-02-11 20:05:42.000000000 -0500 -@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - FUSE_CFLAGS = @FUSE_CFLAGS@ --FUSE_LIBS = @FUSE_LIBS@ -+FUSE_LIBS = @FUSE_LIBS@ -lfuse - GCONF_CFLAGS = @GCONF_CFLAGS@ - GCONF_LIBS = @GCONF_LIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c deleted file mode 100644 index 3733aa7e3..000000000 --- a/devel/gvfs/files/patch-client_gvfsfusedaemon.c +++ /dev/null @@ -1,12 +0,0 @@ ---- client/gvfsfusedaemon.c.orig 2007-11-06 18:06:41.000000000 -0500 -+++ client/gvfsfusedaemon.c 2007-11-06 18:07:30.000000000 -0500 -@@ -28,7 +28,9 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> -+#ifdef __linux__ - #include <sys/vfs.h> -+#endif - #include <sys/time.h> - #include <unistd.h> - #include <stdlib.h> diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure deleted file mode 100644 index cee0fc7d7..000000000 --- a/devel/gvfs/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig 2010-03-30 10:14:50.000000000 +0200 -+++ configure 2010-03-30 10:16:26.000000000 +0200 -@@ -20312,7 +20312,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-larchive $LIBS" -+LIBS="-larchive -lcrypto -lmd $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -20388,7 +20388,7 @@ - if test x$with_archive_libs != x/usr/lib; then - ARCHIVE_LIBS="-L$with_archive_libs -larchive" - else -- ARCHIVE_LIBS="-larchive" -+ ARCHIVE_LIBS="-larchive -lcrypto -lmd" - fi - else - { $as_echo "$as_me:$LINENO: checking for archive_entry_filetype in -larchive" >&5 -@@ -20397,7 +20397,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-larchive $LIBS" -+LIBS="-larchive -lcrypto -lmd $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/devel/gvfs/files/patch-daemon_gvfswritechannel.c b/devel/gvfs/files/patch-daemon_gvfswritechannel.c deleted file mode 100644 index 54c421687..000000000 --- a/devel/gvfs/files/patch-daemon_gvfswritechannel.c +++ /dev/null @@ -1,10 +0,0 @@ ---- daemon/gvfswritechannel.c.orig 2007-12-22 18:50:10.000000000 -0500 -+++ daemon/gvfswritechannel.c 2007-12-22 18:50:20.000000000 -0500 -@@ -30,6 +30,7 @@ - #include <sys/un.h> - #include <unistd.h> - #include <fcntl.h> -+#include <string.h> - - #include <glib.h> - #include <glib-object.h> diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c deleted file mode 100644 index 6686b28ae..000000000 --- a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c +++ /dev/null @@ -1,14 +0,0 @@ ---- monitor/gphoto2/ggphoto2volume.c.orig 2008-07-22 09:29:19.000000000 -0400 -+++ monitor/gphoto2/ggphoto2volume.c 2008-07-22 23:22:30.000000000 -0400 -@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor * - return NULL; - - /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */ -+#ifdef __FreeBSD__ -+ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file"); -+#else - device_path = hal_device_get_property_string (drive_device, "linux.device_file"); -+#endif - if (strlen (device_path) == 0) - device_path = NULL; - |