x11-fm/nautilus2 -> x11-fm/nautilus

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for other ports, chase the rename.

13 files changed, 8 insertions, 9 deletions

diff --git a/MOVED b/MOVED
index 0de098324f32..1aaf669c75da 100644
--- a/MOVED
+++ b/MOVED
@@ -393,7 +393,6 @@ x11/gnome-fifth-toe||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11-wm/sawfish||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 audio/gnomemedia||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 sysutils/gtop||2003-07-15|removed as part of GNOME 1.4 desktop phase out
-x11-fm/nautilus||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 audio/gnomeaudio||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 games/gnomegames||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 misc/gnomeutils||2003-07-15|removed as part of GNOME 1.4 desktop phase out
@@ -2347,3 +2346,4 @@ x11/gnomepanel|x11/gnome-panel|2006-05-28|Renamed to use real vendor package nam
 x11/gnomepanel-reference|x11/gnome-panel-reference|2006-05-28|Renamed to use real vendor package name
 x11/gnomesession|x11/gnome-session|2006-05-28|Renamed to use real vendor package name
 x11/gnometerminal|x11/gnome-terminal|2006-05-28|Renamed to use real vendor package name
+x11-fm/nautilus2|x11-fm/nautilus|2006-05-28|Use unversioned name
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index aec3ac4940ec..3d782a5796ff 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -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/Makefile b/x11-fm/Makefile
index 35c0ad4f52c2..081dea0b1862 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -21,7 +21,7 @@
     SUBDIR += jaffm
     SUBDIR += krusader
     SUBDIR += mtoolsfm
-    SUBDIR += nautilus2
+    SUBDIR += nautilus
     SUBDIR += offix-files
     SUBDIR += pcmanfm
     SUBDIR += py-nautilus
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus/Makefile
index b77b277daaa2..b560a2b257da 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,12 +6,11 @@
 #   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.105 2006/04/13 07:52:42 bland Exp $
 #
 
-PORTNAME=	nautilus2
+PORTNAME=	nautilus
 PORTVERSION=	2.14.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/distinfo b/x11-fm/nautilus/distinfo
index 672c4c291eb1..672c4c291eb1 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus/distinfo
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
index a4f79ca6bb37..a4f79ca6bb37 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus/files/patch-Makefile.in
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index 25fa0ee71c8a..25fa0ee71c8a 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
index 2d67d65e74db..2d67d65e74db 100644
--- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
diff --git a/x11-fm/nautilus2/pkg-descr b/x11-fm/nautilus/pkg-descr
index b4f3fd678e8f..b4f3fd678e8f 100644
--- a/x11-fm/nautilus2/pkg-descr
+++ b/x11-fm/nautilus/pkg-descr
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus/pkg-plist
index b8cea3254ea9..b8cea3254ea9 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index 4b3dbc9f0a5f..ba8f5ff8839c 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	nautilus-python-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python nautilus bindings
 
-LIB_DEPENDS=	nautilus-extension:${PORTSDIR}/x11-fm/nautilus2
+LIB_DEPENDS=	nautilus-extension:${PORTSDIR}/x11-fm/nautilus
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 87201527c82c..e1e414a8c0de 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets
 		gnome-terminal:${PORTSDIR}/x11/gnome-terminal \
 		gnome-session:${PORTSDIR}/x11/gnome-session \
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
-		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
+		nautilus:${PORTSDIR}/x11-fm/nautilus \
 		yelp:${PORTSDIR}/x11/yelp \
 		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 4086b1b9fd23..cb4df0ee687b 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -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 \