summaryrefslogtreecommitdiffstats
path: root/devel/gnome-vfs/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gnome-vfs/files')
-rw-r--r--devel/gnome-vfs/files/patch-aa69
-rw-r--r--devel/gnome-vfs/files/patch-ab10
-rw-r--r--devel/gnome-vfs/files/patch-ac11
-rw-r--r--devel/gnome-vfs/files/patch-devel-docs::Makefile.in14
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in12
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in12
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in11
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c29
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c11
-rw-r--r--devel/gnome-vfs/files/patch-modules_ssh-method.c10
10 files changed, 189 insertions, 0 deletions
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
new file mode 100644
index 000000000..b088829de
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-aa
@@ -0,0 +1,69 @@
+--- configure.orig Wed Sep 4 19:19:58 2002
++++ configure Fri Sep 6 02:28:34 2002
+@@ -8323,6 +8323,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -14189,8 +14190,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
+@@ -14206,7 +14207,7 @@
+ #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 ();
+ #ifdef F77_DUMMY_MAIN
+ # ifdef __cplusplus
+ extern "C"
+@@ -14216,7 +14217,7 @@
+ int
+ main ()
+ {
+-bzCompressInit ();
++BZ2_bzCompressInit ();
+ ;
+ return 0;
+ }
+@@ -14763,7 +14764,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 -lcryptofoo -ldl"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+@@ -14820,9 +14821,9 @@
+
+ msg_openssl="yes"
+ if test x$with_openssl_libs != x/usr/lib; then
+- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
++ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
+ else
+- OPENSSL_LIBS="-lssl -lcrypto"
++ OPENSSL_LIBS="-lssl -lcryptofoo"
+ fi
+
+
+@@ -16488,7 +16489,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@,$PTHREAD_LIB,;t t
++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIB,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@ALLOCA@,$ALLOCA,;t t
+ s,@USE_NLS@,$USE_NLS,;t t
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
new file mode 100644
index 000000000..5b0347024
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ab
@@ -0,0 +1,10 @@
+--- Makefile.in.orig Fri Sep 6 02:29:04 2002
++++ Makefile.in Fri Sep 6 02:29:27 2002
+@@ -183,7 +183,6 @@
+ schemas \
+ devel-docs \
+ doc \
+- test \
+ monikers \
+ po
+
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
new file mode 100644
index 000000000..557a7018d
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ac
@@ -0,0 +1,11 @@
+--- modules/Makefile.in.orig Thu Aug 29 15:57:06 2002
++++ modules/Makefile.in Thu Aug 29 15:58:00 2002
+@@ -180,7 +180,7 @@
+ @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la
+ @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS =
+
+-module_flags = -export_dynamic -avoid-version -module
++module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB)
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+
+ modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libnntp.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libvfs-pipe.la libvfs-translate.la $(CDEMENU_LTLIBS) libssh.la libtar.la $(NULL)
diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
new file mode 100644
index 000000000..1e907269f
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.1 2002/02/16 17:36:46 sobomax 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/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
new file mode 100644
index 000000000..b7ee9579b
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
@@ -0,0 +1,12 @@
+
+$FreeBSD: ports/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in,v 1.1 2002/02/16 17:36:46 sobomax Exp $
+
+--- gnome-vfs-2.0.pc.in 2002/02/16 13:07:24 1.1
++++ gnome-vfs-2.0.pc.in 2002/02/16 13:07:38
+@@ -8,5 +8,5 @@
+ Description: The GNOME virtual file-system libraries
+ Version: @VERSION@
+ Requires: bonobo-activation-2.0,gthread-2.0,gmodule-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
new file mode 100644
index 000000000..d293c450a
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
@@ -0,0 +1,12 @@
+
+$FreeBSD: ports/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in,v 1.1 2002/02/16 17:36:46 sobomax Exp $
+
+--- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1
++++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51
+@@ -8,5 +8,5 @@
+ Description: The GNOME virtual file-system module include info
+ Version: @VERSION@
+ Requires: bonobo-activation-2.0,gthread-2.0,gmodule-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
new file mode 100644
index 000000000..b27e7e217
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -0,0 +1,11 @@
+--- libgnomevfs/Makefile.in.orig Fri Sep 6 02:29:53 2002
++++ libgnomevfs/Makefile.in Fri Sep 6 02:30:42 2002
+@@ -329,7 +329,7 @@
+
+
+ # Platform specific includes
+-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
+ 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
new file mode 100644
index 000000000..53a118250
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
@@ -0,0 +1,29 @@
+
+$FreeBSD: ports/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c,v 1.1 2002/06/13 08:46:21 sobomax Exp $
+
+--- libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 07:31:15 1.1
++++ libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 08:25:24
+@@ -940,6 +940,8 @@
+ static void
+ gnome_vfs_application_registry_init (void)
+ {
++ gchar *tmp;
++
+ if (gnome_vfs_application_registry_initialized)
+ return;
+
+@@ -961,6 +963,14 @@
+ gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry");
+ 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_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL);
+ user_registry_dir.system_dir = FALSE;
+
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
new file mode 100644
index 000000000..c9cffae7a
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 17:01:22 2002
++++ libgnomevfs/gnome-vfs-utils.c Sun May 5 17:02:24 2002
+@@ -774,7 +774,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-vfs/files/patch-modules_ssh-method.c b/devel/gnome-vfs/files/patch-modules_ssh-method.c
new file mode 100644
index 000000000..14b2cf886
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_ssh-method.c
@@ -0,0 +1,10 @@
+--- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002
++++ modules/ssh-method.c Mon Jun 10 13:28:51 2002
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <unistd.h>
+
+ typedef struct {