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/gnome-vfs/files | |
parent | 42048341091e3810049dedfc96d4b312013ab048 (diff) | |
download | marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.gz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.bz2 marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.lz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.xz 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/gnome-vfs/files')
-rw-r--r-- | devel/gnome-vfs/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-ac | 11 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-config.h.in | 12 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-configure | 54 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in | 9 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in | 9 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in | 11 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c | 26 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c | 18 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c | 33 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c | 11 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h | 12 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-modules_file-method-acl.c | 11 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-modules_gzip-method.c | 10 |
14 files changed, 0 insertions, 237 deletions
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in deleted file mode 100644 index 7213df2fa..000000000 --- a/devel/gnome-vfs/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig Tue Jul 11 09:30:02 2006 -+++ Makefile.in Tue Jul 11 09:30:32 2006 -@@ -352,7 +352,6 @@ - devel-docs \ - doc \ - programs \ -- test \ - po - - EXTRA_DIST = \ diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac deleted file mode 100644 index 383987654..000000000 --- a/devel/gnome-vfs/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005 -+++ modules/Makefile.in Mon Oct 3 11:55:55 2005 -@@ -465,7 +465,7 @@ - @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la - @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la - @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = --module_flags = -export_dynamic -avoid-version -module -no-undefined -+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) - modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = \ - $(CDDA_LTLIBS) \ diff --git a/devel/gnome-vfs/files/patch-config.h.in b/devel/gnome-vfs/files/patch-config.h.in deleted file mode 100644 index 70edbcd45..000000000 --- a/devel/gnome-vfs/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig Sun May 7 00:54:09 2006 -+++ config.h.in Sun May 7 00:54:46 2006 -@@ -121,6 +121,9 @@ - /* Define to 1 if you have the <fnmatch.h> header file. */ - #undef HAVE_FNMATCH_H - -+/* Define to 1 if you have the <sys/sysmacros.h> header file. */ -+#undef HAVE_SYS_SYSMACROS_H -+ - /* Define to 1 if you have the <fstab.h> header file. */ - #undef HAVE_FSTAB_H - diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure deleted file mode 100644 index 7865fc3fb..000000000 --- a/devel/gnome-vfs/files/patch-configure +++ /dev/null @@ -1,54 +0,0 @@ ---- configure.orig 2009-10-10 11:55:11.000000000 -0400 -+++ configure 2009-10-10 11:55:14.000000000 -0400 -@@ -8433,7 +8433,7 @@ fi - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h -+ inttypes.h stdint.h unistd.h sys/sysmacros.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -14864,6 +14864,8 @@ $as_echo_n "checking for LC_MESSAGES... - if test "${am_cv_val_LC_MESSAGES+set}" = set; then - $as_echo_n "(cached) " >&6 - else -+ ac_check_lib_save_LIBS=$LIBS -+ LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -14911,6 +14913,7 @@ fi - rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 - $as_echo "$am_cv_val_LC_MESSAGES" >&6; } -@@ -16395,6 +16398,7 @@ as_val=`eval 'as_val=${'$as_ac_var'} - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -+ LIBS="-lintl $LIBS" - have_ngettext=yes - else - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the - $as_echo_n "(cached) " >&6 - else - -- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the - $as_echo_n "(cached) " >&6 - else - -- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in deleted file mode 100644 index eb0f45920..000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gnome-vfs-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 -+++ gnome-vfs-2.0.pc.in Tue Jul 11 09:33:47 2006 -@@ -8,5 +8,5 @@ - Description: The GNOME virtual file-system libraries - Version: @VERSION@ - Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 --Libs: -L${libdir} -lgnomevfs-2 -+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ - Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in deleted file mode 100644 index 168fba882..000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gnome-vfs-module-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 -+++ gnome-vfs-module-2.0.pc.in Tue Jul 11 09:34:36 2006 -@@ -8,5 +8,5 @@ - Description: The GNOME virtual file-system module include info - Version: @VERSION@ - Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 --Libs: -L${libdir} -lgnomevfs-2 -+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ - Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in deleted file mode 100644 index 063376961..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003 -+++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003 -@@ -429,7 +429,7 @@ - # CLEANFILES = $(BUILT_SOURCES) - - # Platform specific includes --libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include -+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - libgnomevfsplatforminclude_HEADERS = \ - gnome-vfs-file-size.h - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c deleted file mode 100644 index 2747466f7..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ /dev/null @@ -1,26 +0,0 @@ ---- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005 -+++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005 -@@ -943,6 +943,8 @@ load_application_info (void) - static void - gnome_vfs_application_registry_init (void) - { -+ gchar *tmp; -+ - if (gnome_vfs_application_registry_initialized) - return; - -@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi - "application-registry", - NULL); - gnome_registry_dir.system_dir = TRUE; -+ -+ tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL); -+ if (mkdir (tmp, 0700) && -+ errno != EEXIST) { -+ g_warning("Could not create per-user GNOME configuration directory: %s", -+ tmp); -+ } -+ g_free(tmp); - - user_registry_dir.dirname = g_build_filename (g_get_home_dir(), - ".gnome", diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c deleted file mode 100644 index 90fb33a41..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2009-10-08 10:03:36.000000000 -0400 -+++ libgnomevfs/gnome-vfs-filesystem-type.c 2009-10-10 11:57:06.000000000 -0400 -@@ -70,6 +70,7 @@ static struct FSInfo fs_data[] = { - { "nfs" , N_("NFS Network Volume"), 1 }, - { "ntfs" , N_("Windows NT Volume"), 0 }, - { "ntfs-3g" , N_("Windows NT Volume"), 1 }, -+ { "nullfs" , N_("BSD Loopback Volume"), 1 }, - { "nilfs2" , N_("NILFS Linux Volume"), 1 }, - { "nwfs" , N_("Netware Volume"), 0 }, - { "proc" , N_("System Volume"), 0 }, -@@ -90,6 +91,7 @@ static struct FSInfo fs_data[] = { - { "xenix" , N_("Xenix Volume"), 0 }, - { "xfs" , N_("XFS Linux Volume"), 1 }, - { "xiafs" , N_("XIAFS Volume"), 0 }, -+ { "zfs" , N_("ZFS Volume"), 1 }, - { "cifs" , N_("CIFS Volume"), 1 }, - }; - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c deleted file mode 100644 index f50e1cb81..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c +++ /dev/null @@ -1,33 +0,0 @@ ---- libgnomevfs/gnome-vfs-hal-mounts.c.orig Mon Aug 7 04:16:27 2006 -+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun Sep 17 17:39:48 2006 -@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume - "/", - "/bin", - "/boot", -+ "/compat/linux/proc", -+ "/compat/linux/sys", - "/dev", - "/etc", - "/home", - "/lib", - "/lib64", -+ "/libexec", - "/media", - "/mnt", - "/opt", -+ "/rescue", - "/root", - "/sbin", - "/srv", - "/tmp", - "/usr", -+ "/usr/local", -+ "/usr/obj", -+ "/usr/ports", -+ "/usr/src", -+ "/usr/X11R6", - "/var", -+ "/var/tmp", - "/proc", - "/sbin", - NULL diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c deleted file mode 100644 index a9879578a..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005 -+++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005 -@@ -234,7 +234,7 @@ - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%LOCALBASE%%/share/"; - - ptr = xdg_data_dirs; - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h deleted file mode 100644 index 7d987f400..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libgnomevfs/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 -+++ libgnomevfs/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 -@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) - #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) - #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) -+#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) - #endif - - extern XdgMimeCache **_caches; diff --git a/devel/gnome-vfs/files/patch-modules_file-method-acl.c b/devel/gnome-vfs/files/patch-modules_file-method-acl.c deleted file mode 100644 index 7ec9a33b8..000000000 --- a/devel/gnome-vfs/files/patch-modules_file-method-acl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/file-method-acl.c.orig Mon Jul 24 18:47:12 2006 -+++ modules/file-method-acl.c Mon Jul 24 22:01:34 2006 -@@ -45,7 +45,7 @@ - #endif - - #ifdef HAVE_POSIX_ACL --# include <acl/libacl.h> -+# include <sys/acl.h> - #define HAVE_ACL 1 - #endif - diff --git a/devel/gnome-vfs/files/patch-modules_gzip-method.c b/devel/gnome-vfs/files/patch-modules_gzip-method.c deleted file mode 100644 index 3288d1853..000000000 --- a/devel/gnome-vfs/files/patch-modules_gzip-method.c +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/gzip-method.c.orig 2010-03-25 16:05:12.000000000 -0400 -+++ modules/gzip-method.c 2010-03-25 16:06:56.000000000 -0400 -@@ -30,6 +30,7 @@ - #include <stdio.h> - #include <string.h> - #include <time.h> -+#undef _LARGEFILE64_SOURCE - #include <zlib.h> - - struct _GZipMethodHandle { |