Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).

This release notes detailing all of the new goodies in GNOME 2.8 can
be found at http://www.gnome.org/start/2.8/notes/, and the list of what
was fixed in GNOME 2.8.1 can be found at
http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html.

This release, as well as all of our others, would not have been possible
without the great efforts of our FreeBSD GNOME Team.  The list of
current members can be found at http://www.freebsd.org/gnome/contact.html
(including our newest member, Michael Johnson <ahze@FreeBSD.org>).

Special thanks also goes out to all of the loyal FreeBSD GNOME users that
put up with crashes and hangs to test and debug GNOME on FreeBSD.  We would
especially like to thank those users that provided patches for GNOME 2.7 and
2.8:

Franz Klammer <klammer@webonaut.com>
Piotr Smyrak <piotr.smyrak@heron.pl>
Radek Kozlowski <radek@raadradd.com>
Khairil Yusof <kaeru@pd.jaring.my>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Vladimir Grebenschikov <vova@fbsd.ru>

GNOME 2.8 also features a new, FreeBSD-specific splashscreen that
was designed by jimmac for GNOME 2.8, then daemonized by
Franz Klammer <klammer@webonaut.com> and Radek Kozlowski
<radek@raadradd.com>.

As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8.  There is
a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh
that will aid in the upgrade process.  Full documentation on the GNOME 2.8
upgrade is coming following this commit.

From all of us at FreeBSD GNOME, ENJOY!

7 files changed, 35 insertions, 106 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 52436b7e3094..76d620b87df4 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.6.3
-PORTREVISION=	2
+PORTVERSION=	2.8.2
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
 DISTNAME=	nautilus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -24,7 +23,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \
 		librsvg2
 GNOME_DESKTOP_VERSION=2
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
@@ -34,8 +33,10 @@ CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--enable-static
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
+GCONF_SCHEMAS=	apps_nautilus_preferences.schemas
+
 post-install:
 	${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0
-	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
+#	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 312e42d24084..1645076c4527 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.6.3.tar.bz2) = ef91c7eefd219800a3aab93e6510a5c9
-SIZE (gnome2/nautilus-2.6.3.tar.bz2) = 5665374
+MD5 (gnome2/nautilus-2.8.2.tar.bz2) = d5fdec9acc37181016e8424e96d663b8
+SIZE (gnome2/nautilus-2.8.2.tar.bz2) = 5808170
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index d1e95a23b85f..7cb9fd809448 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Fri Jun  4 16:51:06 2004
-+++ Makefile.in	Fri Jun  4 17:01:49 2004
-@@ -195,7 +195,6 @@
- 	libnautilus-private 	\
- 	libnautilus-adapter	\
- 	src 			\
--	test 			\
- 	components		\
- 	po 			\
- 	data 			\
+--- Makefile.in.orig	Mon Aug 16 11:35:20 2004
++++ Makefile.in	Mon Aug 16 11:35:34 2004
+@@ -179,7 +179,7 @@
+ DESKTOP_SETTINGS_FILES =  	nautilus-file-management-properties.desktop
+ 
+ 
+-SUBDIRS =  	libnautilus 			libnautilus-extension		cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				test 				components			po 				data 				icons 				docs				$(NULL)
++SUBDIRS =  	libnautilus 			libnautilus-extension		cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				 				components			po 				data 				icons 				docs				$(NULL)
+ 
+ 
+ EXTRA_DIST =  	COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus.desktop				nautilus.desktop.in				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				intltool-extract.in				intltool-merge.in				intltool-update.in				Makefile.shared					add-include-prefix				$(DESKTOP_IN_FILES)				$(DESKTOP_APPLICATIONS_FILES)				$(DESKTOP_SETTINGS_FILES)				$(NULL)
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
index d82ca373940e..411fe669370f 100644
--- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
+++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
@@ -1,11 +1,11 @@
---- libbackground/Makefile.in.orig	Fri Jun  4 17:02:10 2004
-+++ libbackground/Makefile.in	Fri Jun  4 17:02:52 2004
-@@ -173,7 +173,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@
+--- libbackground/Makefile.in.orig	Mon Aug 16 11:36:57 2004
++++ libbackground/Makefile.in	Mon Aug 16 11:37:35 2004
+@@ -171,7 +171,7 @@
+ 
+ EXTRA_DIST = ChangeLog
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
+ 
+ 
+ noinst_LTLIBRARIES = libbackground.la
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c
deleted file mode 100644
index 62385a0ac826..000000000000
--- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libnautilus-private/nautilus-desktop-icon-file.c.orig	Fri Jan 30 16:49:53 2004
-+++ libnautilus-private/nautilus-desktop-icon-file.c	Fri Jan 30 16:50:52 2004
-@@ -199,6 +199,10 @@
- 	file_info->flags = GNOME_VFS_FILE_FLAGS_NONE;
- 	file_info->link_count = 1;
- 	file_info->size = 0;
-+	/* Set a bogus owner and group on these files to prevent nowrite
-+	 * emblems from showing up on the files. */
-+	file_info->uid = -993;
-+	file_info->gid = -993;
- 	file_info->permissions =
- 		GNOME_VFS_PERM_OTHER_WRITE |
- 		GNOME_VFS_PERM_USER_READ |
diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh
deleted file mode 100644
index 3232b8da9655..000000000000
--- a/x11-fm/nautilus2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Sun Jan 11 17:28:53 2004
-+++ ltmain.sh	Fri Jan 30 16:45:37 2004
-@@ -1280,7 +1280,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
- 	   ;;
-@@ -1290,8 +1290,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
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,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/pkg-plist b/x11-fm/nautilus2/pkg-plist
index bc919359aa2a..9e283f87c5bf 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -1,15 +1,5 @@
 bin/nautilus
 bin/nautilus-file-management-properties
-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
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_nautilus_preferences.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_nautilus_preferences.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_nautilus_preferences.schemas > /dev/null || /usr/bin/true
 include/libnautilus/libnautilus.h
 include/libnautilus/nautilus-bonobo-ui.h
 include/libnautilus/nautilus-clipboard.h
@@ -54,14 +44,14 @@ 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_shell.server
-libdata/pkgconfig/libnautilus.pc
 libdata/pkgconfig/libnautilus-extension.pc
+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/nautilus.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
@@ -113,8 +103,6 @@ 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/starthere-link.desktop
-share/gnome/nautilus/starthere.desktop
 share/gnome/nautilus/static_bookmarks.xml
 share/gnome/pixmaps/nautilus/Search.png
 share/gnome/pixmaps/nautilus/audio.png
@@ -153,6 +141,7 @@ 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/bs/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
@@ -187,6 +176,7 @@ 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/nb/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
@@ -204,6 +194,7 @@ share/locale/sr/LC_MESSAGES/nautilus.mo
 share/locale/sr@Latn/LC_MESSAGES/nautilus.mo
 share/locale/sr@ije/LC_MESSAGES/nautilus.mo
 share/locale/sv/LC_MESSAGES/nautilus.mo
+share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/th/LC_MESSAGES/nautilus.mo
 share/locale/tk/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo