Sync w/ FreeBSD ports tree for x11-fm/nautilus2 -> x11-fm/nautilus.

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

9 files changed, 7 insertions, 265 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index e88abb35a..bd3682051 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
 #
 # $FreeBSD$
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.386 2006/05/28 19:53:03 mezz Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.387 2006/05/28 20:08:20 mezz Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -388,7 +388,7 @@ gnomepanel_DETECT=	${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
 gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils
 gnomepanel_GNOME_DESKTOP_VERSION=2
 
-nautilus2_LIB_DEPENDS=	nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus2
+nautilus2_LIB_DEPENDS=	nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
 nautilus2_DETECT=	${X11BASE}/libdata/pkgconfig/libnautilus-extension.pc
 nautilus2_USE_GNOME_IMPL=librsvg2 eel2 gnomedesktop desktopfileutils
 nautilus2_GNOME_DESKTOP_VERSION=2
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 03ffa9b54..1835b517e 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,15 +3,14 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.105 2006/04/13 07:52:42 bland Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.107 2006/05/19 17:05:57 ahze Exp $
 #
 
-PORTNAME=	nautilus2
+PORTNAME=	nautilus
 PORTVERSION=	2.15.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	nautilus-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
deleted file mode 100644
index 03ffa9b54..000000000
--- a/x11-fm/nautilus2/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:    nautilus2
-# Date created:         		28th August 2000
-# Whom:                 		ade, archie
-#
-# $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.105 2006/04/13 07:52:42 bland Exp $
-#
-
-PORTNAME=	nautilus2
-PORTVERSION=	2.15.1
-CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	nautilus-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	File manager for the GNOME desktop
-
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop eel2 \
-		librsvg2 desktopfileutils
-GNOME_DESKTOP_VERSION=2
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	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"
-
-GCONF_SCHEMAS=	apps_nautilus_preferences.schemas
-
-post-install:
-	${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0
-	@-update-desktop-database
-#	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
-
-.include <bsd.port.mk>
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
deleted file mode 100644
index 752e04a81..000000000
--- a/x11-fm/nautilus2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/nautilus-2.15.1.tar.bz2) = 57d5dea7758205258d85afc30cb3afaf
-SHA256 (gnome2/nautilus-2.15.1.tar.bz2) = d2c066b1f572072064de6264131b2d04b6bca8062dba5e0e234580953b5e1e6b
-SIZE (gnome2/nautilus-2.15.1.tar.bz2) = 4103952
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
deleted file mode 100644
index a4f79ca6b..000000000
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Wed Nov 24 13:14:21 2004
-+++ Makefile.in	Wed Nov 24 13:14:47 2004
-@@ -183,7 +183,6 @@
- 	libbackground		\
- 	libnautilus-private 	\
- 	src 			\
--	test 			\
- 	po 			\
- 	data 			\
- 	icons 			\
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
deleted file mode 100644
index 2d67d65e7..000000000
--- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/pkg-descr b/x11-fm/nautilus2/pkg-descr
deleted file mode 100644
index b4f3fd678..000000000
--- a/x11-fm/nautilus2/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Nautilus is a file manager tightly integrated into the GNOME destkop.
-It is also responsible for desktop and icon management, and provides
-an intuitive interface for accessing files and webpages.
-
-WWW: http://www.gnome.org/projects/nautilus/
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
deleted file mode 100644
index 038fc6aac..000000000
--- a/x11-fm/nautilus2/pkg-plist
+++ /dev/null
@@ -1,183 +0,0 @@
-bin/nautilus
-bin/nautilus-connect-server
-bin/nautilus-file-management-properties
-include/nautilus/libnautilus-extension/nautilus-column-provider.h
-include/nautilus/libnautilus-extension/nautilus-column.h
-include/nautilus/libnautilus-extension/nautilus-extension-types.h
-include/nautilus/libnautilus-extension/nautilus-file-info.h
-include/nautilus/libnautilus-extension/nautilus-info-provider.h
-include/nautilus/libnautilus-extension/nautilus-location-widget-provider.h
-include/nautilus/libnautilus-extension/nautilus-menu-item.h
-include/nautilus/libnautilus-extension/nautilus-menu-provider.h
-include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
-include/nautilus/libnautilus-extension/nautilus-property-page.h
-lib/libnautilus-extension.a
-lib/libnautilus-extension.la
-lib/libnautilus-extension.so
-lib/libnautilus-extension.so.1
-libdata/bonobo/servers/Nautilus_shell.server
-libdata/pkgconfig/libnautilus-extension.pc
-share/gnome/applications/nautilus-computer.desktop
-share/gnome/applications/nautilus-file-management-properties.desktop
-share/gnome/applications/nautilus-folder-handler.desktop
-share/gnome/applications/nautilus-home.desktop
-share/gnome/applications/nautilus.desktop
-share/gnome/applications/network-scheme.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/nautilus/browser.xml
-share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
-share/gnome/nautilus/glade/nautilus-file-management-properties.glade
-share/gnome/nautilus/nautilus-extras.placeholder
-share/gnome/nautilus/nautilus-suggested.placeholder
-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/ui/nautilus-desktop-icon-view-ui.xml
-share/gnome/nautilus/ui/nautilus-directory-view-ui.xml
-share/gnome/nautilus/ui/nautilus-icon-view-ui.xml
-share/gnome/nautilus/ui/nautilus-list-view-ui.xml
-share/gnome/nautilus/ui/nautilus-navigation-window-ui.xml
-share/gnome/nautilus/ui/nautilus-shell-ui.xml
-share/gnome/nautilus/ui/nautilus-spatial-window-ui.xml
-share/gnome/pixmaps/nautilus/audio.svg
-share/gnome/pixmaps/nautilus/backgrounds.png
-share/gnome/pixmaps/nautilus/chit_frame.png
-share/gnome/pixmaps/nautilus/colors.png
-share/gnome/pixmaps/nautilus/emblems.png
-share/gnome/pixmaps/nautilus/erase.png
-share/gnome/pixmaps/nautilus/knob.png
-share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
-share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/text-selection-frame.png
-share/gnome/pixmaps/nautilus/thumbnail_frame.png
-share/locale/af/LC_MESSAGES/nautilus.mo
-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/bs/LC_MESSAGES/nautilus.mo
-share/locale/br/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_CA/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/gu/LC_MESSAGES/nautilus.mo
-share/locale/he/LC_MESSAGES/nautilus.mo
-share/locale/hi/LC_MESSAGES/nautilus.mo
-share/locale/hr/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/ka/LC_MESSAGES/nautilus.mo
-share/locale/km/LC_MESSAGES/nautilus.mo
-share/locale/ko/LC_MESSAGES/nautilus.mo
-share/locale/ku/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/mg/LC_MESSAGES/nautilus.mo
-share/locale/mi/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/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
-share/locale/nso/LC_MESSAGES/nautilus.mo
-share/locale/pa/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/rw/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/sr@ije/LC_MESSAGES/nautilus.mo
-share/locale/sv/LC_MESSAGES/nautilus.mo
-share/locale/ta/LC_MESSAGES/nautilus.mo
-share/locale/te/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
-share/locale/uk/LC_MESSAGES/nautilus.mo
-share/locale/vi/LC_MESSAGES/nautilus.mo
-share/locale/wa/LC_MESSAGES/nautilus.mo
-share/locale/xh/LC_MESSAGES/nautilus.mo
-share/locale/yi/LC_MESSAGES/nautilus.mo
-share/locale/zh_CN/LC_MESSAGES/nautilus.mo
-share/locale/zh_HK/LC_MESSAGES/nautilus.mo
-share/locale/zh_TW/LC_MESSAGES/nautilus.mo
-share/locale/zu/LC_MESSAGES/nautilus.mo
-share/mime/application/x-gnome-saved-search.xml
-share/mime/packages/nautilus.xml
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrm share/gnome/pixmaps/nautilus
-@dirrm share/gnome/nautilus/ui
-@dirrm share/gnome/nautilus/patterns
-@dirrm share/gnome/nautilus/glade
-@dirrm share/gnome/nautilus
-@dirrm include/nautilus/libnautilus-extension
-@dirrm include/nautilus
-@exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
-@dirrmtry lib/nautilus/extensions-1.0
-@dirrmtry lib/nautilus
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 59545be8f..2ae2e9625 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2/Makefile,v 1.158 2006/05/28 20:21:32 mezz Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.159 2006/05/28 20:33:19 mezz Exp $
 #
 
 PORTNAME=	gnome2
@@ -28,7 +28,7 @@ RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets
 		gnome-session:${PORTSDIR}/x11/gnome-session \
 		bug-buddy:${PORTSDIR}/devel/bug-buddy \
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
-		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
+		nautilus:${PORTSDIR}/x11-fm/nautilus \
 		yelp:${PORTSDIR}/x11/yelp \
 		${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
 		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \