Update to 2.5.1.1.

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

13 files changed, 554 insertions, 0 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
new file mode 100644
index 000000000..c6a40730c
--- /dev/null
+++ b/x11-fm/nautilus2/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:    nautilus2
+# Date created:         		28th August 2000
+# Whom:                 		ade, archie
+#
+# $FreeBSD: ports/x11-fm/nautilus2/Makefile,v 1.88 2003/10/13 15:50:01 adamw Exp $
+#
+
+PORTNAME=	nautilus2
+PORTVERSION=	2.5.1.1
+CATEGORIES=	x11-fm gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
+DIST_SUBDIR=	gnome2
+DISTNAME=	nautilus-${PORTVERSION}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME file manager and graphical shell developed by Eazel
+
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop eel2 librsvg2
+GNOME_DESKTOP_VERSION=2
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
+		LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
+CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
+		--with-freetype2-include-place=${LOCALBASE}/include/freetype2 \
+		--enable-static
+MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
+
+post-install:
+	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
+
+.include <bsd.port.mk>
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
new file mode 100644
index 000000000..7d8f3fddb
--- /dev/null
+++ b/x11-fm/nautilus2/distinfo
@@ -0,0 +1 @@
+MD5 (gnome2/nautilus-2.5.1.1.tar.bz2) = 6bea3abaf25ab5ee2cbdff03de733e90
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
new file mode 100644
index 000000000..7fe0bcd6e
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Tue Jan  7 12:28:34 2003
++++ Makefile.in	Tue Jan  7 12:29:48 2003
+@@ -153,7 +153,6 @@
+ 	libnautilus-private 	\
+ 	libnautilus-adapter	\
+ 	src 			\
+-	test 			\
+ 	components		\
+ 	po 			\
+ 	data 			\
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
new file mode 100644
index 000000000..d4741108d
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -0,0 +1,29 @@
+--- configure.orig	Mon Nov 10 22:08:05 2003
++++ configure	Mon Nov 10 22:08:05 2003
+@@ -12971,7 +12971,7 @@
+ 
+ LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
+ 
+-LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
++LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
+ 
+ 
+ CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
+@@ -12979,7 +12979,7 @@
+ 
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
+ 
+-CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
++CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
+ 
+ 
+ COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
+@@ -13959,7 +13959,7 @@
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t
+ s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
+-s,@ALL_LIBS@,$ALL_LIBS,;t t
++s~@ALL_LIBS@~$ALL_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/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml
new file mode 100644
index 000000000..54ea8ae37
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml
@@ -0,0 +1,84 @@
+--- data/static_bookmarks.xml.orig	Wed Jun  5 22:58:43 2002
++++ data/static_bookmarks.xml	Wed Jun  5 23:30:11 2002
+@@ -1,54 +1,44 @@
+ <?xml version="1.0"?>
+ <bookmarks>
+   <folder _name="Software">
+-        <bookmark _name="Allaire" icon_name="i-web" uri="http://www.allaire.com/Products/index.cfm"/>
+-        <bookmark _name="Borland" icon_name="i-web" uri="http://www.borland.com/kylix/"/>
+-        <bookmark _name="MandrakeSoft" icon_name="i-web" uri="http://mandrakesoft.com/"/>
+-        <bookmark _name="Netraverse" icon_name="i-web" uri="http://www.netraverse.com"/>
+-        <bookmark _name="Red Hat" icon_name="i-web" uri="http://www.redhat.com"/>
+-        <bookmark _name="SuSE" icon_name="i-web" uri="http://www.suse.com"/>
++	<bookmark _name="4Front Technologies" icon_name="i-web" uri="http://www.4front-tech.com"/>
++	<bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/freebsd1.html"/>
++        <bookmark _name="FreeBSD" icon_name="i-web" uri="http://www.freebsd.org"/>
++        <bookmark _name="GNOME" icon_name="i-web" uri="http://www.gnome.org/"/>
+         <bookmark _name="Sun StarOffice" icon_name="i-web" uri="http://www.sun.com/products/staroffice/"/>
+         <bookmark _name="Ximian" icon_name="i-web" uri="http://www.ximian.com"/>
+-        <bookmark _name="Zero-Knowledge" icon_name="i-web" uri="http://www.zeroknowledge.com"/>
+   </folder>
+   <folder _name="Hardware">
+-        <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com/products/software/linux/"/>
+-        <bookmark _name="CNET Computers.com" icon_name="i-web" uri="http://computers.cnet.com/hardware/0-1016.html"/>
+-        <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com/linux/"/>
+-        <bookmark _name="Penguin Computing" icon_name="i-web" uri="http://www.penguincomputing.com"/>
+-        <bookmark _name="ZDNet Linux Hardware Database" icon_name="i-web" uri="http://lhd.zdnet.com"/>
++	<bookmark _name="Adaptec" icon_name="i-web" uri="http://www.adaptec.com"/>
++	<bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/hardware.html"/>
++	<bookmark _name="Cisco Systems, Inc" icon_name="i-web" uri="http://www.cisco.com"/>
++        <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com"/>
++        <bookmark _name="Data Net Solutions" icon_name="i-web" uri="http://www.eclipse.com"/>
++        <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com"/>
+   </folder>
+   <folder _name="News and Media">
+-         <bookmark _name="Binary Freedom" icon_name="i-web" uri="http://www.binaryfreedom.com/"/>
+-         <bookmark _name="CNET Linux Center" icon_name="i-web" uri="http://linux.cnet.com/linux/0-1518529-7-3378110.html"/>
+-         <bookmark _name="LinuxOrbit.com" icon_name="i-web" uri="http://www.linuxorbit.com"/>
+-         <bookmark _name="Linux Weekly News" icon_name="i-web" uri="http://www.lwn.net"/>
++	 <bookmark _name="BSD Today" icon_name="i-web" uri="http://www.bsdtoday.com"/>
++	 <bookmark _name="Daily Daemon News" icon_name="i-web" uri="http://daily.daemonnews.org"/>
++	 <bookmark _name="Daemon News" icon_name="i-web" uri="http://www.daemonnews.org"/>
+          <bookmark _name="O'Reilly" icon_name="i-web" uri="http://www.oreillynet.com"/>
+-         <bookmark _name="OSDN" icon_name="i-web" uri="http://www.osdn.com"/>
+-         <bookmark _name="ZDNet Linux Resource Center" icon_name="i-web" uri="http://linux.zdnet.com"/>
+   </folder>
+   <folder _name="Web Services">
+-         <bookmark _name="CollabNet" icon_name="i-web" uri="http://www.collab.net/community/"/>
+-         <bookmark _name="Covalent" icon_name="i-web" uri="http://www.covalent.com"/>
+-         <bookmark _name="Rackspace" icon_name="i-web" uri="http://www.rackspace.com"/>
+-         <bookmark _name="Red Hat Network" icon_name="i-web" uri="http://www.redhat.com/network/"/>
++	 <bookmark _name="FreeBSD Services, Ltd." icon_name="i-web" uri="http://www.freebsd-services.com"/>
++	 <bookmark _name="JohnsCompanies Collocation Services" icon_name="i-web" uri="http://www.johncompanies.com/collocation"/>
+          <bookmark _name="SourceForge" icon_name="i-web" uri="http://www.sourceforge.net"/>
+   </folder>
+-  <folder _name="International">
+-         <bookmark _name="Conectiva" icon_name="i-web" uri="http://en.conectiva.com/"/>
+-         <bookmark _name="Linux One" icon_name="i-web" uri="http://www.linuxone.co.kr/english2/eng/main.htm"/>
+-         <bookmark _name="Open Source Asia" icon_name="i-web" uri="http://www.opensourceasia.com"/>
+-         <bookmark _name="RedFlag Linux" icon_name="i-web" uri="http://www.redflag-linux.com/english/index.html"/>
+-         <bookmark _name="Sun Wah Linux" icon_name="i-web" uri="http://www.sw-linux.com/nonflash_front.htm"/>
+-  </folder>
+-  <folder _name="Linux Resources">
+-         <bookmark _name="Debian.org" icon_name="i-web" uri="http://www.debian.org"/>
+-         <bookmark _name="Freshmeat.net" icon_name="i-web" uri="http://www.freshmeat.net"/>
+-         <bookmark _name="GNOME.org" icon_name="i-web" uri="http://www.gnome.org"/>
+-         <bookmark _name="GNU.org" icon_name="i-web" uri="http://www.gnu.org"/>
+-         <bookmark _name="Linux Online" icon_name="i-web" uri="http://www.linux.org"/>
+-         <bookmark _name="Linux Documentation Project" icon_name="i-web" uri="http://www.linuxdoc.org"/>
+-         <bookmark _name="LinuxNewbie.org" icon_name="i-web" uri="http://www.linuxnewbie.org"/>
++  <folder _name="FreeBSD Resources">
++         <bookmark _name="BSD Apps" icon_name="i-web" uri="http://www.bsdapps.com"/>
++         <bookmark _name="BSD At Work" icon_name="i-web" uri="http://www.bsdatwork.com"/>
++	 <bookmark _name="BSD Central" icon_name="i-web" uri="http://bsdcentral.com"/>
++         <bookmark _name="BSD Dev Center" icon_name="i-web" uri="http://www.onlamp.com/bsd/"/>
++	 <bookmark _name="FreeBSD Diary" icon_name="i-web" uri="http://www.freebsddiary.org"/>
++	 <bookmark _name="FreeBSD Forums" icon_name="i-web" uri="http://www.freebsdforums.org"/>
++	 <bookmark _name="FreeBSD GNOME Project" icon_name="i-web" uri="http://www.freebsd.org/gnome"/>
++	 <bookmark _name="FreeBSD Handbook" icon_name="i-web" uri="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/index.html"/>
++	 <bookmark _name="FreeBSD Security Information" icon_name="i-web" uri="http://www.freebsd.org/security/security.html"/>
++         <bookmark _name="Freshports" icon_name="i-web" uri="http://www.freshports.org"/>
++	 <bookmark _name="Google's BSD Search Engine" icon_name="i-web" uri="http://www.google.com/bsd"/>
+          <bookmark _name="OpenOffice" icon_name="i-web" uri="http://www.openoffice.org"/>
+   </folder>
+ </bookmarks>
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
new file mode 100644
index 000000000..835db3474
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
@@ -0,0 +1,11 @@
+--- libbackground/Makefile.in.orig	Tue Jan  7 12:30:18 2003
++++ libbackground/Makefile.in	Tue Jan  7 12:30:58 2003
+@@ -141,7 +141,7 @@
+ 
+ INCLUDES = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
+-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
++	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
+ 	-DG_LOG_DOMAIN=\"capplet-common\"				\
+ 	-I$(top_srcdir)/						\
+ 	@CAPPLET_CFLAGS@
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c
new file mode 100644
index 000000000..b0fb5eb6e
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c,v 1.5 2003/09/18 06:49:35 marcus Exp $
+
+--- libnautilus-private/nautilus-medusa-support.c.orig	Wed Apr 11 21:36:16 2001
++++ libnautilus-private/nautilus-medusa-support.c	Mon May 14 17:45:24 2001
+@@ -84,7 +84,7 @@
+ 		 */
+ 		status = NAUTILUS_CRON_STATUS_OFF;
+ 
+-		stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
++		stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
+ 		stat_file = fopen (stat_file_name, "r");
+ 		g_free (stat_file_name);
+ 		
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml
new file mode 100644
index 000000000..81e3a2a71
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml
@@ -0,0 +1,31 @@
+--- libnautilus-private/filesystem-attributes.xml.orig	Sat Sep 14 16:56:38 2002
++++ libnautilus-private/filesystem-attributes.xml	Sat Sep 14 17:01:31 2002
+@@ -3,10 +3,12 @@
+     <filesystem name="affs"     _default_volume_name="AFFS Volume"/>
+     <filesystem name="afs"      _default_volume_name="AFS Network Volume"/>
+     <filesystem name="auto"     _default_volume_name="Auto-detected Volume"/>
++    <filesystem name="cd9660"  _default_volume_name="CDROM Volume"/>
+     <filesystem name="cdda"     _default_volume_name="CD Digital Audio"/>
+     <filesystem name="cdrom"    _default_volume_name="CD-ROM Drive"/>
+     <filesystem name="devfs"    _default_volume_name="Hardware Device Volume"/>
+     <filesystem name="ext2"     _default_volume_name="Ext2 Linux Volume" trash="yes"/>
++    <filesystem name="ext2fs"     _default_volume_name="Ext2 Linux Volume" trash="yes"/>
+     <filesystem name="ext3"     _default_volume_name="Ext3 Linux Volume" trash="yes"/>
+     <filesystem name="fat"      _default_volume_name="MSDOS Volume" trash="yes"/>
+     <filesystem name="hfs"	_default_volume_name="MacOS Volume" trash="yes"/>
+@@ -15,10 +17,15 @@
+     <filesystem name="hsfs"     _default_volume_name="Hsfs CDROM Volume"/>
+     <filesystem name="jfs"      _default_volume_name="JFS Volume" trash="yes"/>
+     <filesystem name="hpfs"     _default_volume_name="Windows NT Volume"/>
++    <filesystem name="linprocfs"     _default_volume_name="System Volume"/>
++    <filesystem name="mfs"	_default_volume_name="Memory Volume" trash="yes"/>
+     <filesystem name="minix"    _default_volume_name="Minix Volume"/>
+     <filesystem name="msdos"    _default_volume_name="MSDOS Volume"/>
+     <filesystem name="nfs"      _default_volume_name="NFS Network Volume" trash="yes"/>
++    <filesystem name="ntfs"     _default_volume_name="Windows NT Volume"/>
++    <filesystem name="nwfs"     _default_volume_name="Netware Volume"/>
+     <filesystem name="proc"     _default_volume_name="System Volume"/>
++    <filesystem name="procfs"     _default_volume_name="System Volume"/>
+     <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/>
+     <filesystem name="smbfs"    _default_volume_name="Windows Shared Volume" trash="yes"/>
+     <filesystem name="supermount"      _default_volume_name="SuperMount Volume" />
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c
new file mode 100644
index 000000000..2d67d65e7
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c
@@ -0,0 +1,10 @@
+--- libnautilus-private/nautilus-emblem-utils.c.orig	Mon Oct 14 22:20:28 2002
++++ libnautilus-private/nautilus-emblem-utils.c	Mon Oct 14 22:20:56 2002
+@@ -24,6 +24,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
+ #include <utime.h>
+ #include <stdio.h>
+ #include <time.h>
diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh
new file mode 100644
index 000000000..854b2a10a
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Sat Feb  8 09:47:44 2003
++++ ltmain.sh	Mon Jun 30 18:31:09 2003
+@@ -1075,7 +1075,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1085,8 +1085,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2503,6 +2511,9 @@
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4330,10 +4341,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c
new file mode 100644
index 000000000..5f84cfbe5
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c
@@ -0,0 +1,31 @@
+--- src/file-manager/fm-directory-view.c.orig	Thu Oct  2 23:30:40 2003
++++ src/file-manager/fm-directory-view.c	Thu Oct  2 23:52:04 2003
+@@ -4314,19 +4314,25 @@
+ 
+ 	nautilus_bonobo_set_hidden (view->details->ui, 
+ 				    FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, 
+-				    !any_scripts);
++				    FALSE);
+ 	nautilus_bonobo_set_hidden (view->details->ui, 
+ 				    FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS, 
++				    FALSE);
++	nautilus_bonobo_set_hidden (view->details->ui,
++				    FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER,
++				    !any_scripts);
++	nautilus_bonobo_set_hidden (view->details->ui,
++				    FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER,
+ 				    !any_scripts);
+ 	nautilus_bonobo_set_hidden (view->details->ui, 
+ 				    FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS, 
+-				    !any_scripts);
++				    FALSE);
+ 	nautilus_bonobo_set_hidden (view->details->ui, 
+ 				    FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR, 
+ 				    !any_scripts);
+ 	nautilus_bonobo_set_hidden (view->details->ui, 
+ 				    FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_SEPARATOR, 
+-				    !any_scripts);
++				    FALSE);
+ 	nautilus_bonobo_set_hidden (view->details->ui, 
+ 				    FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, 
+ 				    !any_scripts);
diff --git a/x11-fm/nautilus2/pkg-descr b/x11-fm/nautilus2/pkg-descr
new file mode 100644
index 000000000..af143c4fb
--- /dev/null
+++ b/x11-fm/nautilus2/pkg-descr
@@ -0,0 +1,8 @@
+Nautilus is an open-source file manager and graphical shell being
+developed by Eazel, Inc. and others. It is part of the GNOME project,
+and its source code can be found in the GNOME CVS repository.
+Nautilus is still in the early stages of development.  It will
+become an integral part of the GNOME desktop environment when it
+is finished.
+
+WWW: http://nautilus.eazel.com/
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
new file mode 100644
index 000000000..2d99be489
--- /dev/null
+++ b/x11-fm/nautilus2/pkg-plist
@@ -0,0 +1,234 @@
+bin/nautilus
+bin/nautilus-file-management-properties
+bin/nautilus-server-connect
+etc/X11/serverconfig/.directory
+etc/X11/starthere/.directory
+etc/X11/starthere/applications.desktop
+etc/X11/starthere/preferences.desktop
+etc/X11/starthere/serverconfig.desktop
+etc/X11/starthere/sysconfig.desktop
+etc/X11/sysconfig/.directory
+etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree/%gconf.xml
+etc/gconf/schemas/apps_nautilus_preferences.schemas
+include/libnautilus/libnautilus.h
+include/libnautilus/nautilus-bonobo-ui.h
+include/libnautilus/nautilus-clipboard.h
+include/libnautilus/nautilus-distributed-undo.h
+include/libnautilus/nautilus-idle-queue.h
+include/libnautilus/nautilus-scroll-positionable.h
+include/libnautilus/nautilus-undo-private.h
+include/libnautilus/nautilus-undo.h
+include/libnautilus/nautilus-view-component.h
+include/libnautilus/nautilus-view-standard-main.h
+include/libnautilus/nautilus-view.h
+lib/bonobo/libnautilus-emblem-view.so
+lib/bonobo/libnautilus-history-view.so
+lib/bonobo/libnautilus-image-properties-view.so
+lib/bonobo/libnautilus-notes-view.so
+lib/bonobo/libnautilus-tree-view.so
+lib/libnautilus-adapter.a
+lib/libnautilus-adapter.so
+lib/libnautilus-adapter.so.2
+lib/libnautilus-private.a
+lib/libnautilus-private.so
+lib/libnautilus-private.so.2
+lib/libnautilus.a
+lib/libnautilus.so
+lib/libnautilus.so.2
+libdata/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
+libdata/bonobo/servers/Nautilus_Control_throbber.server
+libdata/bonobo/servers/Nautilus_View_emblem.server
+libdata/bonobo/servers/Nautilus_View_history.server
+libdata/bonobo/servers/Nautilus_View_image_properties.server
+libdata/bonobo/servers/Nautilus_View_notes.server
+libdata/bonobo/servers/Nautilus_View_text.server
+libdata/bonobo/servers/Nautilus_View_tree.server
+libdata/bonobo/servers/Nautilus_shell.server
+libdata/pkgconfig/libnautilus.pc
+libexec/nautilus-adapter
+libexec/nautilus-text-view
+libexec/nautilus-throbber
+share/gnome/applications/nautilus.desktop
+share/gnome/applications/nautilus-computer.desktop
+share/gnome/applications/nautilus-home.desktop
+share/gnome/applications/network-scheme.desktop
+share/gnome/control-center-2.0/capplets/nautilus-file-management-properties.desktop
+share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-navigation-window-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-spatial-window-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml
+share/gnome/idl/nautilus-distributed-undo.idl
+share/gnome/idl/nautilus-view-component.idl
+share/gnome/nautilus/browser.xml
+share/gnome/nautilus/filesystem-attributes.xml
+share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
+share/gnome/nautilus/glade/nautilus-file-management-properties.glade
+share/gnome/nautilus/glade/nautilus-server-connect.glade
+share/gnome/nautilus/nautilus-extras.placeholder
+share/gnome/nautilus/nautilus-suggested.placeholder
+share/gnome/nautilus/patterns/.striated.png
+share/gnome/nautilus/patterns/blue_gray_rough.png
+share/gnome/nautilus/patterns/blue_ridge.png
+share/gnome/nautilus/patterns/blue_type.png
+share/gnome/nautilus/patterns/brushed_metal.png
+share/gnome/nautilus/patterns/burlap.jpg
+share/gnome/nautilus/patterns/camouflage.png
+share/gnome/nautilus/patterns/chalk.jpg
+share/gnome/nautilus/patterns/cork.png
+share/gnome/nautilus/patterns/countertop.png
+share/gnome/nautilus/patterns/dark-gnome.jpg
+share/gnome/nautilus/patterns/dots.png
+share/gnome/nautilus/patterns/fibers.png
+share/gnome/nautilus/patterns/fleur_de_lis.png
+share/gnome/nautilus/patterns/floral.png
+share/gnome/nautilus/patterns/fossil.png
+share/gnome/nautilus/patterns/gnome.jpg
+share/gnome/nautilus/patterns/green_weave.png
+share/gnome/nautilus/patterns/ice.png
+share/gnome/nautilus/patterns/manila_paper.png
+share/gnome/nautilus/patterns/moss_ridge.png
+share/gnome/nautilus/patterns/numbers.png
+share/gnome/nautilus/patterns/ocean_stripes.png
+share/gnome/nautilus/patterns/purple_marble.png
+share/gnome/nautilus/patterns/reset.png
+share/gnome/nautilus/patterns/ridged_paper.png
+share/gnome/nautilus/patterns/rough_paper.png
+share/gnome/nautilus/patterns/sky_ridge.png
+share/gnome/nautilus/patterns/snow_ridge.png
+share/gnome/nautilus/patterns/stucco.jpg
+share/gnome/nautilus/patterns/terracotta.png
+share/gnome/nautilus/patterns/wavy_white.png
+share/gnome/nautilus/services/text/google.xml
+share/gnome/nautilus/services/text/webster.xml
+share/gnome/nautilus/starthere-link.desktop
+share/gnome/nautilus/starthere.desktop
+share/gnome/nautilus/static_bookmarks.xml
+share/gnome/network/nautilus-server-connect.desktop
+share/gnome/pixmaps/nautilus/CD_drive.png
+share/gnome/pixmaps/nautilus/HD_drive.png
+share/gnome/pixmaps/nautilus/Search.png
+share/gnome/pixmaps/nautilus/audio.png
+share/gnome/pixmaps/nautilus/backgrounds.png
+share/gnome/pixmaps/nautilus/chit_frame.png
+share/gnome/pixmaps/nautilus/colors.png
+share/gnome/pixmaps/nautilus/cpu.png
+share/gnome/pixmaps/nautilus/crux_eggplant/Search.png
+share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
+share/gnome/pixmaps/nautilus/crux_teal/Search.png
+share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
+share/gnome/pixmaps/nautilus/default/Search.png
+share/gnome/pixmaps/nautilus/default/default.xml
+share/gnome/pixmaps/nautilus/default/side_bar_image.png
+share/gnome/pixmaps/nautilus/emblems.png
+share/gnome/pixmaps/nautilus/erase.png
+share/gnome/pixmaps/nautilus/gnome/Services.png
+share/gnome/pixmaps/nautilus/gnome/gnome.xml
+share/gnome/pixmaps/nautilus/knob.png
+share/gnome/pixmaps/nautilus/memory_chip.gif
+share/gnome/pixmaps/nautilus/nautilus-desktop.png
+share/gnome/pixmaps/nautilus/nautilus-file-management-properties.png
+share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
+share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
+share/gnome/pixmaps/nautilus/nautilus-server-connect.png
+share/gnome/pixmaps/nautilus/note-indicator.png
+share/gnome/pixmaps/nautilus/side_bar_image.png
+share/gnome/pixmaps/nautilus/sierra/green_weave.png
+share/gnome/pixmaps/nautilus/sierra/sierra.xml
+share/gnome/pixmaps/nautilus/tahoe/bluewall.png
+share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
+share/gnome/pixmaps/nautilus/text-selection-frame.png
+share/gnome/pixmaps/nautilus/thumbnail_frame.png
+share/locale/am/LC_MESSAGES/nautilus.mo
+share/locale/ar/LC_MESSAGES/nautilus.mo
+share/locale/az/LC_MESSAGES/nautilus.mo
+share/locale/be/LC_MESSAGES/nautilus.mo
+share/locale/bg/LC_MESSAGES/nautilus.mo
+share/locale/bn/LC_MESSAGES/nautilus.mo
+share/locale/ca/LC_MESSAGES/nautilus.mo
+share/locale/cs/LC_MESSAGES/nautilus.mo
+share/locale/cy/LC_MESSAGES/nautilus.mo
+share/locale/da/LC_MESSAGES/nautilus.mo
+share/locale/de/LC_MESSAGES/nautilus.mo
+share/locale/el/LC_MESSAGES/nautilus.mo
+share/locale/en_GB/LC_MESSAGES/nautilus.mo
+share/locale/es/LC_MESSAGES/nautilus.mo
+share/locale/et/LC_MESSAGES/nautilus.mo
+share/locale/eu/LC_MESSAGES/nautilus.mo
+share/locale/fa/LC_MESSAGES/nautilus.mo
+share/locale/fi/LC_MESSAGES/nautilus.mo
+share/locale/fr/LC_MESSAGES/nautilus.mo
+share/locale/ga/LC_MESSAGES/nautilus.mo
+share/locale/gl/LC_MESSAGES/nautilus.mo
+share/locale/he/LC_MESSAGES/nautilus.mo
+share/locale/hi/LC_MESSAGES/nautilus.mo
+share/locale/hu/LC_MESSAGES/nautilus.mo
+share/locale/id/LC_MESSAGES/nautilus.mo
+share/locale/is/LC_MESSAGES/nautilus.mo
+share/locale/it/LC_MESSAGES/nautilus.mo
+share/locale/ja/LC_MESSAGES/nautilus.mo
+share/locale/ko/LC_MESSAGES/nautilus.mo
+share/locale/li/LC_MESSAGES/nautilus.mo
+share/locale/lt/LC_MESSAGES/nautilus.mo
+share/locale/lv/LC_MESSAGES/nautilus.mo
+share/locale/mk/LC_MESSAGES/nautilus.mo
+share/locale/ml/LC_MESSAGES/nautilus.mo
+share/locale/mn/LC_MESSAGES/nautilus.mo
+share/locale/ms/LC_MESSAGES/nautilus.mo
+share/locale/ne/LC_MESSAGES/nautilus.mo
+share/locale/nl/LC_MESSAGES/nautilus.mo
+share/locale/nn/LC_MESSAGES/nautilus.mo
+share/locale/no/LC_MESSAGES/nautilus.mo
+share/locale/pl/LC_MESSAGES/nautilus.mo
+share/locale/pt/LC_MESSAGES/nautilus.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus.mo
+share/locale/ro/LC_MESSAGES/nautilus.mo
+share/locale/ru/LC_MESSAGES/nautilus.mo
+share/locale/sk/LC_MESSAGES/nautilus.mo
+share/locale/sl/LC_MESSAGES/nautilus.mo
+share/locale/sq/LC_MESSAGES/nautilus.mo
+share/locale/sr/LC_MESSAGES/nautilus.mo
+share/locale/sr@Latn/LC_MESSAGES/nautilus.mo
+share/locale/sv/LC_MESSAGES/nautilus.mo
+share/locale/th/LC_MESSAGES/nautilus.mo
+share/locale/tr/LC_MESSAGES/nautilus.mo
+share/locale/uk/LC_MESSAGES/nautilus.mo
+share/locale/vi/LC_MESSAGES/nautilus.mo
+share/locale/wa/LC_MESSAGES/nautilus.mo
+share/locale/yi/LC_MESSAGES/nautilus.mo
+share/locale/zh_CN/LC_MESSAGES/nautilus.mo
+share/locale/zh_TW/LC_MESSAGES/nautilus.mo
+@dirrm share/gnome/pixmaps/nautilus/default
+@dirrm share/gnome/network
+@dirrm share/gnome/nautilus/glade
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/desktop
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus