diff options
Diffstat (limited to 'devel/gnome-vfs1/files')
-rw-r--r-- | devel/gnome-vfs1/files/patch-aa | 65 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-ab | 42 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-ac | 40 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-ag | 11 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-private-utils.c | 11 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-process.c | 11 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-libgnomevfs-pthread::Makefile.in | 14 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-libgnomevfs::Makefile.in | 14 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-libgnomevfs::libcharset::Makefile.in | 20 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c | 11 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-ltmain.sh | 45 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-modules::file-method.c | 11 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-modules_cdda-method.c | 26 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-modules_default-modules.conf | 12 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-po::Makefile.in.in | 14 | ||||
-rw-r--r-- | devel/gnome-vfs1/files/patch-vfsConf.sh.in | 13 |
16 files changed, 0 insertions, 360 deletions
diff --git a/devel/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa deleted file mode 100644 index 371c29055556..000000000000 --- a/devel/gnome-vfs1/files/patch-aa +++ /dev/null @@ -1,65 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Sun Mar 17 15:24:47 2002 -+++ configure Sun Mar 17 15:25:13 2002 -@@ -5953,7 +5953,7 @@ - VFS_GNOME_LIBS="`gnome-config --libs gnome`" - VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`" - VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`" --VFS_GLIB_CONFIG="glib-config" -+VFS_GLIB_CONFIG="$GLIB_CONFIG" - - - -@@ -9856,8 +9856,8 @@ - done - fi - --echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:9861: checking for bzCompressInit in -lbz2" >&5 -+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:9861: checking for BZ2_bzCompressInit in -lbz2" >&5 - ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9870,10 +9870,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char bzCompressInit(); -+char BZ2_bzCompressInit(); - - int main() { --bzCompressInit() -+BZ2_bzCompressInit() - ; return 0; } - EOF - if { (eval echo configure:9880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -10103,7 +10103,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - -- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo" - cat > conftest.$ac_ext <<EOF - #line 10109 "configure" - #include "confdefs.h" -@@ -10137,7 +10137,7 @@ - EOF - - msg_openssl="yes" -- OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto -ldl" -+ OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo" - - - if true; then -@@ -10897,7 +10897,7 @@ - s%@GTK_CFLAGS@%$GTK_CFLAGS%g - s%@GTK_LIBS@%$GTK_LIBS%g - s%@cflags_set@%$cflags_set%g --s%@PTHREAD_LIB@%$PTHREAD_LIB%g -+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIBS%g - s%@ALLOCA@%$ALLOCA%g - s%@USE_NLS@%$USE_NLS%g - s%@MSGFMT@%$MSGFMT%g diff --git a/devel/gnome-vfs1/files/patch-ab b/devel/gnome-vfs1/files/patch-ab deleted file mode 100644 index 55058a4d496b..000000000000 --- a/devel/gnome-vfs1/files/patch-ab +++ /dev/null @@ -1,42 +0,0 @@ - -$FreeBSD$ - ---- Makefile.in.orig Sun Mar 17 16:04:01 2002 -+++ Makefile.in Sun Mar 17 16:14:05 2002 -@@ -187,10 +187,10 @@ - cflags_set = @cflags_set@ - cxxflags_set = @cxxflags_set@ - l = @l@ --@PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = doc --@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc test -+@PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = -+@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = - --SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules devel-docs $(SUBDIRS_GNOME) po -+SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules $(SUBDIRS_GNOME) po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec vfsConf.sh.in xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in gnome-vfs-config.in -@@ -198,7 +198,7 @@ - - bin_SCRIPTS = $(top_builddir)/gnome-vfs-config - --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = vfsConf.sh - - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -537,11 +537,13 @@ - -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \ - -e 's?\@VERSION\@?$(VERSION)?g' \ - -e 's?\@VFS_LIBS\@?$(VFS_LIBS)?g' \ -+ -e 's?\@PTHREAD_LIB\@?$(PTHREAD_LIB)?g' \ - < $(srcdir)/vfsConf.sh.in > vfsConf.tmp \ - && mv vfsConf.tmp vfsConf.sh - - gnome-vfs-config: gnome-vfs-config.in Makefile - sed -e 's?\@LIBDIR\@?$(libdir)?g' \ -+ -e 's?\@SYSCONFDIR\@?$(sysconfdir)?g' \ - -e 's?\@VFS_LIBDIR\@?$(VFS_LIBDIR)?g' \ - -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \ - -e 's?\@VERSION\@?$(VERSION)?g' \ diff --git a/devel/gnome-vfs1/files/patch-ac b/devel/gnome-vfs1/files/patch-ac deleted file mode 100644 index 53175ace8261..000000000000 --- a/devel/gnome-vfs1/files/patch-ac +++ /dev/null @@ -1,40 +0,0 @@ ---- modules/Makefile.in.orig Thu Aug 26 21:10:36 2004 -+++ modules/Makefile.in Thu Aug 26 21:11:07 2004 -@@ -189,7 +189,7 @@ - l = @l@ - - NULL = --SUBDIRS = extfs -+SUBDIRS = - - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libgnomevfs -I$(top_builddir)/libgnomevfs -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GLIB_CFLAGS) $(XML_CFLAGS) $(LIBEFS_CFLAGS) $(GCONF_CFLAGS) $(VFS_GNOME_CFLAGS) $(VFS_CFLAGS) $(WERROR) -D_GNU_SOURCE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSYSCONFDIR=\"$(sysconfdir)\" -DPREFIX=\"$(prefix)\" -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - -@@ -199,10 +199,10 @@ - @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la - @HAVE_CDDA_FALSE@CDDA_LTLIBS = - --module_flags = -export_dynamic -avoid-version -+module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB) - modulesdir = $(libdir)/vfs/modules - --modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libnntp.la libvfs-pipe.la libvfs-translate.la libdesktop.la $(NULL) -+modules_LTLIBRARIES = $(CDDA_LTLIBS) libfile.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libnntp.la libvfs-pipe.la libvfs-translate.la libdesktop.la $(NULL) - - - # Disabled for now -@@ -218,15 +218,8 @@ - - libcdda_la_SOURCES = cdda-method.c cdda-method.h cdda-cddb.c cdda-cddb.h cdda-cdrom-extensions.h - -- - libcdda_la_LDFLAGS = $(module_flags) - libcdda_la_LIBADD = -L/gnome/lib -lcdda_paranoia -lcdda_interface -- --### `extfs' method -- --libextfs_la_SOURCES = extfs-method.c extfs-method.h -- --libextfs_la_LDFLAGS = $(module_flags) - - ### `file' method - diff --git a/devel/gnome-vfs1/files/patch-ag b/devel/gnome-vfs1/files/patch-ag deleted file mode 100644 index da795f940c50..000000000000 --- a/devel/gnome-vfs1/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-vfs-config.in.orig Thu Aug 31 14:32:38 2000 -+++ gnome-vfs-config.in Wed Nov 29 15:04:43 2000 -@@ -3,7 +3,7 @@ - usage="\ - Usage: gnome-vfs-config [--version] [--config] [--cflags] [--libs]" - --config_file="@LIBDIR@/vfsConf.sh" -+config_file="@SYSCONFDIR@/vfsConf.sh" - . $config_file - - if test $# -eq 0; then diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-private-utils.c b/devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-private-utils.c deleted file mode 100644 index 6ba85e4fce80..000000000000 --- a/devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-private-utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-private-utils.c.orig Mon Jul 16 20:21:07 2001 -+++ libgnomevfs/gnome-vfs-private-utils.c Sat Aug 14 00:00:56 2004 -@@ -263,7 +263,7 @@ - * - * Return value: - **/ --GnomeVFSProcessResult -+GnomeVFSProcessRunResult - gnome_vfs_process_run_cancellable (const gchar *file_name, - const gchar * const argv[], - GnomeVFSProcessOptions options, diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-process.c b/devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-process.c deleted file mode 100644 index 8fb98a428944..000000000000 --- a/devel/gnome-vfs1/files/patch-libgnomevfs-gnome-vfs-process.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-process.c.orig Mon Jul 16 20:21:07 2001 -+++ libgnomevfs/gnome-vfs-process.c Sat Aug 14 00:13:06 2004 -@@ -258,7 +258,7 @@ - * - * Return value: A numeric value reporting the result of the operation. - **/ --GnomeVFSProcessRunResult -+GnomeVFSProcessResult - gnome_vfs_process_signal (GnomeVFSProcess *process, - guint signal_number) - { diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs-pthread::Makefile.in b/devel/gnome-vfs1/files/patch-libgnomevfs-pthread::Makefile.in deleted file mode 100644 index 715ae45928ec..000000000000 --- a/devel/gnome-vfs1/files/patch-libgnomevfs-pthread::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libgnomevfs-pthread/Makefile.in 2002/01/24 08:42:41 1.1 -+++ libgnomevfs-pthread/Makefile.in 2002/01/24 08:43:37 -@@ -207,7 +207,7 @@ - - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - LIBS = @LIBS@ --libgnomevfs_pthread_la_LIBADD = -+libgnomevfs_pthread_la_LIBADD = $(PTHREAD_LIB) - libgnomevfs_pthread_la_OBJECTS = gnome-vfs-pthread.lo \ - gnome-vfs-thread-pool.lo gnome-vfs-async-job-map.lo \ - gnome-vfs-async-ops.lo gnome-vfs-job-slave.lo gnome-vfs-job.lo diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs1/files/patch-libgnomevfs::Makefile.in deleted file mode 100644 index 77e49d02b783..000000000000 --- a/devel/gnome-vfs1/files/patch-libgnomevfs::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libgnomevfs/Makefile.in.orig Sun Mar 17 16:04:01 2002 -+++ libgnomevfs/Makefile.in Sun Mar 17 16:26:57 2002 -@@ -215,7 +215,7 @@ - - - # Platform specific includes --libgnomevfsplatofrmincludedir = $(libdir)/gnome-vfs-1.0/include -+libgnomevfsplatofrmincludedir = $(includedir)/gnome-vfs-1.0/libgnomevfs - libgnomevfsplatofrminclude_HEADERS = gnome-vfs-file-size.h - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs::libcharset::Makefile.in b/devel/gnome-vfs1/files/patch-libgnomevfs::libcharset::Makefile.in deleted file mode 100644 index b28eeb05fffe..000000000000 --- a/devel/gnome-vfs1/files/patch-libgnomevfs::libcharset::Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- libgnomevfs/libcharset/Makefile.in.orig Mon May 6 15:14:48 2002 -+++ libgnomevfs/libcharset/Makefile.in Mon May 6 15:33:22 2002 -@@ -188,7 +188,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -DLIBDIR=\"$(libdir)\" -+INCLUDES = -DLIBDIR=\"%%LOCALBASE%%/libdata\" - - - noinst_LTLIBRARIES = libcharset.la -@@ -351,7 +351,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: install-exec-local -+install-exec-am: - install-exec: install-exec-am - - install-data-am: diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c deleted file mode 100644 index 078542421129..000000000000 --- a/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 16:42:00 2002 -+++ libgnomevfs/gnome-vfs-utils.c Sun May 5 16:42:15 2002 -@@ -771,7 +771,7 @@ - paths = g_strsplit (gnome_var, ":", 0); - - for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { -- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); -+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (hack_file_exists (full_filename)) { - g_strfreev (paths); - return full_filename; diff --git a/devel/gnome-vfs1/files/patch-ltmain.sh b/devel/gnome-vfs1/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/devel/gnome-vfs1/files/patch-ltmain.sh +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed Jan 23 11:38:40 2002 -+++ ltmain.sh Sun Feb 3 01:44:17 2002 -@@ -1037,8 +1037,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2412,6 +2420,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4179,10 +4190,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gnome-vfs1/files/patch-modules::file-method.c b/devel/gnome-vfs1/files/patch-modules::file-method.c deleted file mode 100644 index 1786e41ad2f0..000000000000 --- a/devel/gnome-vfs1/files/patch-modules::file-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/file-method.c.orig Fri Nov 9 12:02:38 2001 -+++ modules/file-method.c Fri Nov 9 12:02:52 2001 -@@ -46,7 +46,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <limits.h> --#include <malloc.h> -+#include <stdlib.h> - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> diff --git a/devel/gnome-vfs1/files/patch-modules_cdda-method.c b/devel/gnome-vfs1/files/patch-modules_cdda-method.c deleted file mode 100644 index d1692cc03e47..000000000000 --- a/devel/gnome-vfs1/files/patch-modules_cdda-method.c +++ /dev/null @@ -1,26 +0,0 @@ ---- modules/cdda-method.c.orig Wed Jan 22 13:54:31 2003 -+++ modules/cdda-method.c Wed Jan 22 13:54:33 2003 -@@ -623,7 +623,11 @@ - // Check and see if we already have opened and stashed this drive - if (!use_base) { - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { -+#endif - use_cache = TRUE; - cdda_close (drive); - gnome_vfs_file_info_copy (file_info, global_context->file_info); -@@ -709,7 +713,11 @@ - if (!use_base) { - // Check for cache - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { -+#endif - // Clear old cache - cdda_context_free (global_context); - global_context = cdda_context_new (drive, uri); diff --git a/devel/gnome-vfs1/files/patch-modules_default-modules.conf b/devel/gnome-vfs1/files/patch-modules_default-modules.conf deleted file mode 100644 index 33830491e394..000000000000 --- a/devel/gnome-vfs1/files/patch-modules_default-modules.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/default-modules.conf.orig Thu Aug 26 21:11:40 2004 -+++ modules/default-modules.conf Thu Aug 26 21:11:47 2004 -@@ -30,9 +30,6 @@ - - ssh: ssh - --# The various access methods implemented by the extfs system. --a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs -- - # and the desktop module - preferences: libdesktop.so - system-settings: libdesktop.so diff --git a/devel/gnome-vfs1/files/patch-po::Makefile.in.in b/devel/gnome-vfs1/files/patch-po::Makefile.in.in deleted file mode 100644 index bbdedf273594..000000000000 --- a/devel/gnome-vfs1/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- po/Makefile.in.in 2001/09/17 14:26:57 1.1 -+++ po/Makefile.in.in 2001/09/17 14:27:14 -@@ -106,7 +106,7 @@ - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ -- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ -+ lang=`echo $$cat | sed 's/\.mo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ diff --git a/devel/gnome-vfs1/files/patch-vfsConf.sh.in b/devel/gnome-vfs1/files/patch-vfsConf.sh.in deleted file mode 100644 index a38a6ca21262..000000000000 --- a/devel/gnome-vfs1/files/patch-vfsConf.sh.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- vfsConf.sh.in 2001/09/28 11:13:40 1.1 -+++ vfsConf.sh.in 2001/09/28 11:15:11 -@@ -2,6 +2,6 @@ - # Configuration file for using the gnome-vfs library - # - VFS_LIBDIR="@VFS_LIBDIR@" --VFS_LIBS="@VFS_LIBS@" -+VFS_LIBS="@VFS_LIBS@ @PTHREAD_LIB@" - VFS_INCLUDEDIR="@VFS_INCLUDEDIR@" - MODULE_VERSION="gnome-vfs-@VERSION@" |