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.

14 files changed, 9 insertions, 10 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index abd67cf..05632d5 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -7078,12 +7078,12 @@ nast		ports/net/nast
 nat		ports/net-mgmt/nat
 naturaldocs	ports/devel/naturaldocs
 naturalmath	ports/math/naturalmath
+nautilus	ports/x11-fm/nautilus
 nautilus-actions	ports/deskutils/nautilus-actions
 nautilus-cd-burner	ports/sysutils/nautilus-cd-burner
 nautilus-locked-folder	ports/deskutils/nautilus-locked-folder
 nautilus-open-terminal	ports/deskutils/nautilus-open-terminal
 nautilus-sendto	ports/deskutils/nautilus-sendto
-nautilus2	ports/x11-fm/nautilus2
 nauty		ports/math/nauty
 nav		ports/net-mgmt/nav
 nawk		ports/lang/nawk
diff --git a/MOVED b/MOVED
index 0de0983..1aaf669 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 aec3ac4..3d782a5 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 35c0ad4..081dea0 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 b77b277..b560a2b 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 672c4c2..672c4c2 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 a4f79ca..a4f79ca 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 25fa0ee..25fa0ee 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 2d67d65..2d67d65 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 b4f3fd6..b4f3fd6 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 b8cea32..b8cea32 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 4b3dbc9..ba8f5ff 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 8720152..e1e414a 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 4086b1b..cb4df0e 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 \