summaryrefslogtreecommitdiffstats
path: root/devel/gnomevfs2/files
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-06 12:07:55 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-06 12:07:55 +0800
commit82668a5a8439e675e24ef1e63feab92af1f68e42 (patch)
treeb1dec9b5a11909412754cde7a86124bed0f04607 /devel/gnomevfs2/files
parente6bbcf50151b2b71ae5e44168254d8cdedb6ad66 (diff)
downloadmarcuscom-ports-82668a5a8439e675e24ef1e63feab92af1f68e42.tar
marcuscom-ports-82668a5a8439e675e24ef1e63feab92af1f68e42.tar.gz
marcuscom-ports-82668a5a8439e675e24ef1e63feab92af1f68e42.tar.bz2
marcuscom-ports-82668a5a8439e675e24ef1e63feab92af1f68e42.tar.lz
marcuscom-ports-82668a5a8439e675e24ef1e63feab92af1f68e42.tar.xz
marcuscom-ports-82668a5a8439e675e24ef1e63feab92af1f68e42.tar.zst
marcuscom-ports-82668a5a8439e675e24ef1e63feab92af1f68e42.zip
- Clean devel
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5056 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnomevfs2/files')
-rw-r--r--devel/gnomevfs2/files/patch-Makefile.in10
-rw-r--r--devel/gnomevfs2/files/patch-aa89
-rw-r--r--devel/gnomevfs2/files/patch-ac11
-rw-r--r--devel/gnomevfs2/files/patch-devel-docs::Makefile.in15
-rw-r--r--devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in9
-rw-r--r--devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in9
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in11
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c26
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c15
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c26
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c11
-rw-r--r--devel/gnomevfs2/files/patch-modules_file-method.c12
-rw-r--r--devel/gnomevfs2/files/patch-modules_sftp-method.c12
13 files changed, 0 insertions, 256 deletions
diff --git a/devel/gnomevfs2/files/patch-Makefile.in b/devel/gnomevfs2/files/patch-Makefile.in
deleted file mode 100644
index 8c0d2a131..000000000
--- a/devel/gnomevfs2/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig Tue Nov 30 02:05:26 2004
-+++ Makefile.in Tue Nov 30 02:05:34 2004
-@@ -230,7 +230,6 @@
- devel-docs \
- doc \
- programs \
-- test \
- monikers \
- po
-
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
deleted file mode 100644
index caf6411ff..000000000
--- a/devel/gnomevfs2/files/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.orig Tue Jun 1 03:53:13 2004
-+++ configure Tue Jun 1 03:53:13 2004
-@@ -22815,6 +22815,8 @@
- if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lintl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22897,6 +22899,7 @@
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -22904,6 +22907,7 @@
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+ LIBS="-lintl $LIBS"
- have_ngettext=yes
- else
- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -26876,8 +26880,8 @@
- done
- fi
-
--echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
--echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5
-+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
- if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26896,11 +26900,11 @@
- #endif
- /* 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;
- }
-@@ -28031,7 +28035,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&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
-@@ -29660,6 +29664,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/fstyp.h>
- _ACEOF
-@@ -29700,6 +29707,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/vmount.h>
- _ACEOF
-@@ -31338,6 +31348,7 @@
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-+s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@USE_NLS@,$USE_NLS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
deleted file mode 100644
index 383987654..000000000
--- a/devel/gnomevfs2/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/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index 9cceb7e91..000000000
--- a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
- $MCom$
-
---- 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-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
deleted file mode 100644
index 088433c51..000000000
--- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system libraries
- Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 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/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
deleted file mode 100644
index c3f0d2c30..000000000
--- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system module include info
- Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 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/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
deleted file mode 100644
index 063376961..000000000
--- a/devel/gnomevfs2/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/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c
deleted file mode 100644
index 2747466f7..000000000
--- a/devel/gnomevfs2/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/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
deleted file mode 100644
index 6e3660c84..000000000
--- 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-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 9c558eefd..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005
-+++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005
-@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
- for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
- full_filename = g_build_filename (*temp_paths,
- "share",
-+ "gnome",
- "pixmaps",
- relative_filename,
- NULL);
-@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri
- resolved_uri = gnome_vfs_uri_resolve_relative (new_uri,
- info->symlink_name);
- if (*p != 0) {
-+ gnome_vfs_uri_unref (new_uri);
-+
-+ new_uri = gnome_vfs_uri_append_string (resolved_uri, p);
-+
- gnome_vfs_uri_unref (uri);
-- uri = gnome_vfs_uri_append_string (resolved_uri, p);
- gnome_vfs_uri_unref (resolved_uri);
-+
-+ uri = gnome_vfs_uri_ref (new_uri);
- } else {
- gnome_vfs_uri_unref (uri);
- uri = resolved_uri;
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
deleted file mode 100644
index 37cc69f1e..000000000
--- a/devel/gnomevfs2/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 = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
-
- ptr = xdg_data_dirs;
-
diff --git a/devel/gnomevfs2/files/patch-modules_file-method.c b/devel/gnomevfs2/files/patch-modules_file-method.c
deleted file mode 100644
index dbb237226..000000000
--- a/devel/gnomevfs2/files/patch-modules_file-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/file-method.c.orig Sun May 22 23:30:16 2005
-+++ modules/file-method.c Sun May 22 23:31:08 2005
-@@ -66,6 +66,9 @@
- #if HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #elif HAVE_SYS_MOUNT_H
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/mount.h>
- #endif
-
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 e1255db17..000000000
--- 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);