3 files changed, 10 insertions, 32 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index f751fbc85c19..f39b9a22af2b 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -3,18 +3,19 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
+#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.90 2005/10/03 16:24:38 marcus Exp $
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.10.1
+PORTVERSION=	2.12.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
 DISTNAME=	nautilus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME file manager and graphical shell developed by Eazel
+COMMENT=	File manager for the GNOME desktop
 
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
 
@@ -25,7 +26,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop eel2 \
 		librsvg2 desktopfileutils
 GNOME_DESKTOP_VERSION=2
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 59982ad77c29..e9e415e3e968 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.10.1.tar.bz2) = 976d725db15e901bc881dfb8c50145c1
-SIZE (gnome2/nautilus-2.10.1.tar.bz2) = 5960278
+MD5 (gnome2/nautilus-2.12.1.tar.bz2) = 61878b1c3f9bee37cd568e17b31d66b1
+SIZE (gnome2/nautilus-2.12.1.tar.bz2) = 4056062
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index d9580a06efda..2e738f0a6fbe 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -69,34 +69,15 @@ 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/Search.png
-share/gnome/pixmaps/nautilus/audio.png
+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/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/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/af/LC_MESSAGES/nautilus.mo
@@ -133,6 +114,7 @@ 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/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
@@ -162,6 +144,7 @@ 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
@@ -177,12 +160,6 @@ share/locale/zu/LC_MESSAGES/nautilus.mo
 @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
-@dirrm share/gnome/pixmaps/nautilus/tahoe
-@dirrm share/gnome/pixmaps/nautilus/sierra
-@dirrm share/gnome/pixmaps/nautilus/gnome
-@dirrm share/gnome/pixmaps/nautilus/default
-@dirrm share/gnome/pixmaps/nautilus/crux_teal
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant
 @dirrm share/gnome/pixmaps/nautilus
 @dirrm share/gnome/nautilus/ui
 @dirrm share/gnome/nautilus/patterns