Add at 2.11.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4008 df743ca5-7f9a-e211-a948-0013205c9059

42 files changed, 1358 insertions, 0 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
new file mode 100644
index 000000000..5a0b9f5c0
--- /dev/null
+++ b/devel/gnome-vfs/Makefile
@@ -0,0 +1,116 @@
+# New ports collection makefile for:	gnomevfs2
+# Date created:				28th June 2000
+# Whom:					Ade Lovett <ade@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/gnomevfs2/Makefile,v 1.99 2005/04/11 08:34:53 bland Exp $
+#
+
+PORTNAME=	gnomevfs2
+PORTVERSION=	2.11.1
+CATEGORIES=	devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.11
+DISTNAME=	gnome-vfs-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME Virtual File System
+
+RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
+		libbonobo
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=15
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--enable-openssl \
+		--disable-gnutls
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+
+GCONF_SCHEMAS=	desktop_default_applications.schemas \
+		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
+		system_http_proxy.schemas system_smb.schemas
+
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_CDPARANOIA
+.undef WITHOUT_SAMBA
+.undef WITHOUT_MDNS
+WITH_MDNS=		yes
+WITH_CDPARANOIA=	yes
+WITH_SAMBA=		yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
+WITH_CDPARANOIA=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libsmbclient.so)
+WITH_SAMBA=		yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libhowl.so)
+WITH_MDNS=		yes
+.endif
+
+.if defined(WITH_CDPARANOIA)
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	CDPARANOIA=""
+.else
+PLIST_SUB+=	CDPARANOIA="@comment "
+.endif
+
+.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
+FAM_DEPENDS=	${PORTSDIR}/devel/fam
+.if exists(${LOCALBASE}/lib/libgamin-1.so)
+FAM_DEPENDS=	${PORTSDIR}/devel/gamin
+.endif
+LIB_DEPENDS+=	fam.0:${FAM_DEPENDS}
+.endif
+
+.if exists(${LOCALBASE}/lib/libkrb5.so)
+LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
+.endif
+
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+=	SAMBA=""
+.else
+PLIST_SUB+=	SAMBA="@comment "
+.endif
+
+.if defined(WITH_MDNS)
+LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/libgnomevfs/Makefile.in
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/libgnomevfs/xdgmime.c \
+		${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
+	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
+		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+
+pre-configure:
+	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]' 2> /dev/null`" ]; then \
+		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
+		${FALSE}; \
+	fi
+
+post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.post.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
new file mode 100644
index 000000000..5f61a54fb
--- /dev/null
+++ b/devel/gnome-vfs/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/gnome-vfs-2.11.1.tar.bz2) = 4c2e8132c229b8b48ae3d39d68581400
+SIZE (gnome2/gnome-vfs-2.11.1.tar.bz2) = 1864315
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in
new file mode 100644
index 000000000..8c0d2a131
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- 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/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
new file mode 100644
index 000000000..caf6411ff
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-aa
@@ -0,0 +1,89 @@
+--- 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/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
new file mode 100644
index 000000000..9362cac17
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ac
@@ -0,0 +1,11 @@
+--- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
++++ modules/Makefile.in	Tue May  6 15:41:28 2003
+@@ -210,7 +210,7 @@
+ @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
+ @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_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 = \
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..0140946ff
--- /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.6 2005/03/12 10:39:15 marcus 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..927861f39
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
@@ -0,0 +1,9 @@
+--- gnome-vfs-2.0.pc.in.orig	Sun May 22 23:05:33 2005
++++ gnome-vfs-2.0.pc.in	Sun May 22 23:05:46 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
+-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..1d8d87e30
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
@@ -0,0 +1,9 @@
+--- gnome-vfs-module-2.0.pc.in.orig	Sun May 22 23:06:38 2005
++++ gnome-vfs-module-2.0.pc.in	Sun May 22 23:06:45 2005
+@@ -8,5 +8,5 @@ Name: gnome-vfs-module
+ Description: The GNOME virtual file-system module include info
+ Version: @VERSION@
+ Requires: bonobo-activation-2.0,gthread-2.0,gmodule-no-export-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..063376961
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..2747466f7
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
@@ -0,0 +1,26 @@
+--- 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-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c
new file mode 100644
index 000000000..a61e83417
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/gnome-vfs-mime-info.c.orig	Wed Aug  4 13:41:52 2004
++++ libgnomevfs/gnome-vfs-mime-info.c	Wed Aug  4 13:42:10 2004
+@@ -149,7 +149,7 @@
+ 
+ 	xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+ 	if (!xdg_data_dirs) {
+-		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/";
+ 	}
+ 	
+ 	split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c
new file mode 100644
index 000000000..698150125
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c
@@ -0,0 +1,38 @@
+--- libgnomevfs/gnome-vfs-mime.c.orig	Sat Mar 19 18:59:45 2005
++++ libgnomevfs/gnome-vfs-mime.c	Sat Mar 19 19:02:24 2005
+@@ -167,7 +167,9 @@
+ 	GnomeVFSResult result = GNOME_VFS_OK;
+ 	const char *mime_type;
+ 
++	G_LOCK (mime_mutex);
+ 	max_extents = xdg_mime_get_max_buffer_extents ();
++	G_UNLOCK (mime_mutex);
+ 	max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED);
+ 
+ 	if (!buffer->read_whole_file) {
+@@ -592,7 +594,9 @@
+ 	g_return_val_if_fail (a != NULL, FALSE);
+ 	g_return_val_if_fail (b != NULL, FALSE);
+ 
++	G_LOCK (mime_mutex);
+ 	xdg_mime_mime_type_equal (a, b);
++	G_UNLOCK (mime_mutex);
+ 
+ 	return FALSE;
+ }
+@@ -626,8 +630,13 @@
+ 
+ 	if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) {
+ 		return GNOME_VFS_MIME_IDENTICAL;
+-	} else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
+-		return GNOME_VFS_MIME_PARENT;
++	} else {
++		G_LOCK (mime_mutex);
++		if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
++			G_UNLOCK (mime_mutex);
++			return GNOME_VFS_MIME_PARENT;
++		}
++		G_UNLOCK (mime_mutex);
+ 	}
+ 
+ 	return GNOME_VFS_MIME_UNRELATED;
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c
new file mode 100644
index 000000000..6e3660c84
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c
@@ -0,0 +1,15 @@
+--- 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/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..a3ef273b0
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sun May 22 23:18:12 2005
++++ libgnomevfs/gnome-vfs-utils.c	Sun May 22 23:18:55 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);
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
new file mode 100644
index 000000000..472a4b5f6
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/xdgmime.c.orig	Thu Jul 22 11:20:13 2004
++++ libgnomevfs/xdgmime.c	Thu Jul 22 11:20:52 2004
+@@ -189,7 +189,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/gnome-vfs/files/patch-modules_file-method.c b/devel/gnome-vfs/files/patch-modules_file-method.c
new file mode 100644
index 000000000..dbb237226
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_file-method.c
@@ -0,0 +1,12 @@
+--- 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/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c
new file mode 100644
index 000000000..e1255db17
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_sftp-method.c
@@ -0,0 +1,12 @@
+--- 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);
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
new file mode 100644
index 000000000..f58585ef6
--- /dev/null
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.2 2005/03/12 10:39:14 marcus Exp $
+#
+# Restore gconf keys of libgnome.
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+fi
+
+SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
+
+if [ -f ${SCHEMAS} ]; then
+	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
+	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+		> /dev/null || /usr/bin/true
+fi
+
+exit 0
diff --git a/devel/gnome-vfs/pkg-descr b/devel/gnome-vfs/pkg-descr
new file mode 100644
index 000000000..03cbc07f6
--- /dev/null
+++ b/devel/gnome-vfs/pkg-descr
@@ -0,0 +1,7 @@
+The GNOME Virtual File System allows applications and users to treat
+any number of file system concepts as a part of the local filesystem.
+With GnomeVFS, filesystems across the internet, on connected devices,
+and in multiple formats are as simple to access (and write code for)
+as any directory on the local machine.
+
+WWW: http://www.gnome.org/
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
new file mode 100644
index 000000000..228bfa255
--- /dev/null
+++ b/devel/gnome-vfs/pkg-install.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/gnomevfs2/pkg-install.in,v 1.2 2005/03/12 10:39:14 marcus Exp $
+#
+# Restore gconf keys of libgnome.
+
+if [ "$2" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
+
+if [ -f ${SCHEMAS} ]; then
+	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
+	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+		> /dev/null || /usr/bin/true
+fi
+
+exit 0
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
new file mode 100644
index 000000000..f608cc8fa
--- /dev/null
+++ b/devel/gnome-vfs/pkg-plist
@@ -0,0 +1,228 @@
+bin/gnomevfs-cat
+bin/gnomevfs-copy
+bin/gnomevfs-info
+bin/gnomevfs-ls
+bin/gnomevfs-mkdir
+bin/gnomevfs-monitor
+bin/gnomevfs-mv
+bin/gnomevfs-rm
+%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
+etc/gnome-vfs-2.0/modules/default-modules.conf
+%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
+etc/gnome-vfs-2.0/modules/ssl-modules.conf
+include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
+lib/gnome-vfs-2.0/modules/libbzip2.so
+%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
+lib/gnome-vfs-2.0/modules/libcomputer.so
+lib/gnome-vfs-2.0/modules/libdns-sd.so
+lib/gnome-vfs-2.0/modules/libfile.so
+lib/gnome-vfs-2.0/modules/libftp.so
+lib/gnome-vfs-2.0/modules/libgzip.so
+lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnetwork.so
+lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libsftp.so
+%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
+lib/gnome-vfs-2.0/modules/libtar.so
+lib/gnome-vfs-2.0/modules/libvfs-test.so
+lib/libgnomevfs-2.a
+lib/libgnomevfs-2.so
+lib/libgnomevfs-2.so.1100
+libdata/bonobo/servers/GNOME_VFS_Daemon.server
+libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
+libdata/pkgconfig/gnome-vfs-2.0.pc
+libdata/pkgconfig/gnome-vfs-module-2.0.pc
+libexec/gnome-vfs-daemon
+share/doc/gnome-vfs-2.0/about.html
+share/doc/gnome-vfs-2.0/advanced-operations.html
+share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
+share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/home.png
+share/doc/gnome-vfs-2.0/index.html
+share/doc/gnome-vfs-2.0/index.sgml
+share/doc/gnome-vfs-2.0/left.png
+share/doc/gnome-vfs-2.0/mime-registry.html
+share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/networking.html
+share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
+share/doc/gnome-vfs-2.0/up.png
+share/doc/gnome-vfs-2.0/volumes.html
+share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
+@dirrm share/doc/gnome-vfs-2.0
+@dirrm include/gnome-vfs-module-2.0/libgnomevfs
+@dirrm include/gnome-vfs-module-2.0
+@dirrm include/gnome-vfs-2.0/libgnomevfs
+@dirrm include/gnome-vfs-2.0/include
+@dirrm include/gnome-vfs-2.0
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
new file mode 100644
index 000000000..5a0b9f5c0
--- /dev/null
+++ b/devel/gnomevfs2/Makefile
@@ -0,0 +1,116 @@
+# New ports collection makefile for:	gnomevfs2
+# Date created:				28th June 2000
+# Whom:					Ade Lovett <ade@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/gnomevfs2/Makefile,v 1.99 2005/04/11 08:34:53 bland Exp $
+#
+
+PORTNAME=	gnomevfs2
+PORTVERSION=	2.11.1
+CATEGORIES=	devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.11
+DISTNAME=	gnome-vfs-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME Virtual File System
+
+RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
+		libbonobo
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=15
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--enable-openssl \
+		--disable-gnutls
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+
+GCONF_SCHEMAS=	desktop_default_applications.schemas \
+		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
+		system_http_proxy.schemas system_smb.schemas
+
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_CDPARANOIA
+.undef WITHOUT_SAMBA
+.undef WITHOUT_MDNS
+WITH_MDNS=		yes
+WITH_CDPARANOIA=	yes
+WITH_SAMBA=		yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
+WITH_CDPARANOIA=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libsmbclient.so)
+WITH_SAMBA=		yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libhowl.so)
+WITH_MDNS=		yes
+.endif
+
+.if defined(WITH_CDPARANOIA)
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	CDPARANOIA=""
+.else
+PLIST_SUB+=	CDPARANOIA="@comment "
+.endif
+
+.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
+FAM_DEPENDS=	${PORTSDIR}/devel/fam
+.if exists(${LOCALBASE}/lib/libgamin-1.so)
+FAM_DEPENDS=	${PORTSDIR}/devel/gamin
+.endif
+LIB_DEPENDS+=	fam.0:${FAM_DEPENDS}
+.endif
+
+.if exists(${LOCALBASE}/lib/libkrb5.so)
+LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
+.endif
+
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+=	SAMBA=""
+.else
+PLIST_SUB+=	SAMBA="@comment "
+.endif
+
+.if defined(WITH_MDNS)
+LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/libgnomevfs/Makefile.in
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/libgnomevfs/xdgmime.c \
+		${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
+	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
+		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+
+pre-configure:
+	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]' 2> /dev/null`" ]; then \
+		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
+		${FALSE}; \
+	fi
+
+post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.post.mk>
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
new file mode 100644
index 000000000..5f61a54fb
--- /dev/null
+++ b/devel/gnomevfs2/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/gnome-vfs-2.11.1.tar.bz2) = 4c2e8132c229b8b48ae3d39d68581400
+SIZE (gnome2/gnome-vfs-2.11.1.tar.bz2) = 1864315
diff --git a/devel/gnomevfs2/files/patch-Makefile.in b/devel/gnomevfs2/files/patch-Makefile.in
new file mode 100644
index 000000000..8c0d2a131
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000..caf6411ff
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-aa
@@ -0,0 +1,89 @@
+--- 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
new file mode 100644
index 000000000..9362cac17
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-ac
@@ -0,0 +1,11 @@
+--- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
++++ modules/Makefile.in	Tue May  6 15:41:28 2003
+@@ -210,7 +210,7 @@
+ @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
+ @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_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 = \
diff --git a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
new file mode 100644
index 000000000..0140946ff
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.6 2005/03/12 10:39:15 marcus 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/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
new file mode 100644
index 000000000..927861f39
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
@@ -0,0 +1,9 @@
+--- gnome-vfs-2.0.pc.in.orig	Sun May 22 23:05:33 2005
++++ gnome-vfs-2.0.pc.in	Sun May 22 23:05:46 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
+-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
new file mode 100644
index 000000000..1d8d87e30
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
@@ -0,0 +1,9 @@
+--- gnome-vfs-module-2.0.pc.in.orig	Sun May 22 23:06:38 2005
++++ gnome-vfs-module-2.0.pc.in	Sun May 22 23:06:45 2005
+@@ -8,5 +8,5 @@ Name: gnome-vfs-module
+ Description: The GNOME virtual file-system module include info
+ Version: @VERSION@
+ Requires: bonobo-activation-2.0,gthread-2.0,gmodule-no-export-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
new file mode 100644
index 000000000..063376961
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..2747466f7
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c
@@ -0,0 +1,26 @@
+--- 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-mime-info.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c
new file mode 100644
index 000000000..a61e83417
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/gnome-vfs-mime-info.c.orig	Wed Aug  4 13:41:52 2004
++++ libgnomevfs/gnome-vfs-mime-info.c	Wed Aug  4 13:42:10 2004
+@@ -149,7 +149,7 @@
+ 
+ 	xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+ 	if (!xdg_data_dirs) {
+-		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/";
+ 	}
+ 	
+ 	split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c
new file mode 100644
index 000000000..698150125
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c
@@ -0,0 +1,38 @@
+--- libgnomevfs/gnome-vfs-mime.c.orig	Sat Mar 19 18:59:45 2005
++++ libgnomevfs/gnome-vfs-mime.c	Sat Mar 19 19:02:24 2005
+@@ -167,7 +167,9 @@
+ 	GnomeVFSResult result = GNOME_VFS_OK;
+ 	const char *mime_type;
+ 
++	G_LOCK (mime_mutex);
+ 	max_extents = xdg_mime_get_max_buffer_extents ();
++	G_UNLOCK (mime_mutex);
+ 	max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED);
+ 
+ 	if (!buffer->read_whole_file) {
+@@ -592,7 +594,9 @@
+ 	g_return_val_if_fail (a != NULL, FALSE);
+ 	g_return_val_if_fail (b != NULL, FALSE);
+ 
++	G_LOCK (mime_mutex);
+ 	xdg_mime_mime_type_equal (a, b);
++	G_UNLOCK (mime_mutex);
+ 
+ 	return FALSE;
+ }
+@@ -626,8 +630,13 @@
+ 
+ 	if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) {
+ 		return GNOME_VFS_MIME_IDENTICAL;
+-	} else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
+-		return GNOME_VFS_MIME_PARENT;
++	} else {
++		G_LOCK (mime_mutex);
++		if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) {
++			G_UNLOCK (mime_mutex);
++			return GNOME_VFS_MIME_PARENT;
++		}
++		G_UNLOCK (mime_mutex);
+ 	}
+ 
+ 	return GNOME_VFS_MIME_UNRELATED;
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
new file mode 100644
index 000000000..6e3660c84
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000..a3ef273b0
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sun May 22 23:18:12 2005
++++ libgnomevfs/gnome-vfs-utils.c	Sun May 22 23:18:55 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);
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
new file mode 100644
index 000000000..472a4b5f6
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/xdgmime.c.orig	Thu Jul 22 11:20:13 2004
++++ libgnomevfs/xdgmime.c	Thu Jul 22 11:20:52 2004
+@@ -189,7 +189,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
new file mode 100644
index 000000000..dbb237226
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_file-method.c
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000..e1255db17
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_sftp-method.c
@@ -0,0 +1,12 @@
+--- 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);
diff --git a/devel/gnomevfs2/pkg-deinstall.in b/devel/gnomevfs2/pkg-deinstall.in
new file mode 100644
index 000000000..f58585ef6
--- /dev/null
+++ b/devel/gnomevfs2/pkg-deinstall.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.2 2005/03/12 10:39:14 marcus Exp $
+#
+# Restore gconf keys of libgnome.
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+fi
+
+SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
+
+if [ -f ${SCHEMAS} ]; then
+	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
+	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+		> /dev/null || /usr/bin/true
+fi
+
+exit 0
diff --git a/devel/gnomevfs2/pkg-descr b/devel/gnomevfs2/pkg-descr
new file mode 100644
index 000000000..03cbc07f6
--- /dev/null
+++ b/devel/gnomevfs2/pkg-descr
@@ -0,0 +1,7 @@
+The GNOME Virtual File System allows applications and users to treat
+any number of file system concepts as a part of the local filesystem.
+With GnomeVFS, filesystems across the internet, on connected devices,
+and in multiple formats are as simple to access (and write code for)
+as any directory on the local machine.
+
+WWW: http://www.gnome.org/
diff --git a/devel/gnomevfs2/pkg-install.in b/devel/gnomevfs2/pkg-install.in
new file mode 100644
index 000000000..228bfa255
--- /dev/null
+++ b/devel/gnomevfs2/pkg-install.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/gnomevfs2/pkg-install.in,v 1.2 2005/03/12 10:39:14 marcus Exp $
+#
+# Restore gconf keys of libgnome.
+
+if [ "$2" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
+
+if [ -f ${SCHEMAS} ]; then
+	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
+	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+		> /dev/null || /usr/bin/true
+fi
+
+exit 0
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
new file mode 100644
index 000000000..f608cc8fa
--- /dev/null
+++ b/devel/gnomevfs2/pkg-plist
@@ -0,0 +1,228 @@
+bin/gnomevfs-cat
+bin/gnomevfs-copy
+bin/gnomevfs-info
+bin/gnomevfs-ls
+bin/gnomevfs-mkdir
+bin/gnomevfs-monitor
+bin/gnomevfs-mv
+bin/gnomevfs-rm
+%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
+etc/gnome-vfs-2.0/modules/default-modules.conf
+%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
+etc/gnome-vfs-2.0/modules/ssl-modules.conf
+include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
+lib/gnome-vfs-2.0/modules/libbzip2.so
+%%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
+lib/gnome-vfs-2.0/modules/libcomputer.so
+lib/gnome-vfs-2.0/modules/libdns-sd.so
+lib/gnome-vfs-2.0/modules/libfile.so
+lib/gnome-vfs-2.0/modules/libftp.so
+lib/gnome-vfs-2.0/modules/libgzip.so
+lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnetwork.so
+lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libsftp.so
+%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
+lib/gnome-vfs-2.0/modules/libtar.so
+lib/gnome-vfs-2.0/modules/libvfs-test.so
+lib/libgnomevfs-2.a
+lib/libgnomevfs-2.so
+lib/libgnomevfs-2.so.1100
+libdata/bonobo/servers/GNOME_VFS_Daemon.server
+libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
+libdata/pkgconfig/gnome-vfs-2.0.pc
+libdata/pkgconfig/gnome-vfs-module-2.0.pc
+libexec/gnome-vfs-daemon
+share/doc/gnome-vfs-2.0/about.html
+share/doc/gnome-vfs-2.0/advanced-operations.html
+share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
+share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/home.png
+share/doc/gnome-vfs-2.0/index.html
+share/doc/gnome-vfs-2.0/index.sgml
+share/doc/gnome-vfs-2.0/left.png
+share/doc/gnome-vfs-2.0/mime-registry.html
+share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/networking.html
+share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
+share/doc/gnome-vfs-2.0/up.png
+share/doc/gnome-vfs-2.0/volumes.html
+share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
+@dirrm share/doc/gnome-vfs-2.0
+@dirrm include/gnome-vfs-module-2.0/libgnomevfs
+@dirrm include/gnome-vfs-module-2.0
+@dirrm include/gnome-vfs-2.0/libgnomevfs
+@dirrm include/gnome-vfs-2.0/include
+@dirrm include/gnome-vfs-2.0
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true