x11-wm/sawfish2 -> x11-wm/sawfish

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.

19 files changed, 8 insertions, 9 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 4b6d78f9ec51..3d24e24813c4 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -12133,8 +12133,8 @@ sather		ports/lang/Sather
 sattrack	ports/astro/sattrack
 sauerbraten	ports/games/sauerbraten
 savelogs	ports/sysutils/savelogs
+sawfish		ports/x11-wm/sawfish
 sawfish-themes	ports/x11-themes/sawfish-themes
-sawfish2	ports/x11-wm/sawfish2
 saxon		ports/textproc/saxon
 saxon-devel	ports/textproc/saxon-devel
 sb16config	ports/sysutils/sb16config
diff --git a/MOVED b/MOVED
index af053fc79993..49a96df47bae 100644
--- a/MOVED
+++ b/MOVED
@@ -390,7 +390,6 @@ x11/xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/linux-xalf||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 x11/gnome||2003-07-15|removed as part of GNOME 1.4 desktop phase out
 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
 audio/gnomeaudio||2003-07-15|removed as part of GNOME 1.4 desktop phase out
@@ -2350,3 +2349,4 @@ x11-fm/nautilus2|x11-fm/nautilus|2006-05-28|Use unversioned name
 x11-toolkits/gtk--|x11-toolkits/gtkmm12|2006-05-29|Renamed to use real vendor package name
 x11-toolkits/gtk--2|x11-toolkits/gtkmm20|2006-05-29|Renamed to use real vendor package name
 x11-toolkits/gtk--2-reference|x11-toolkits/gtkmm20-reference|2006-05-29|Renamed to use real vendor package name
+x11-wm/sawfish2|x11-wm/sawfish|2006-05-29|Use unversioned name
diff --git a/x11-themes/sawfish-themes/Makefile b/x11-themes/sawfish-themes/Makefile
index 0ba193925aa3..9e94a9e7e8ba 100644
--- a/x11-themes/sawfish-themes/Makefile
+++ b/x11-themes/sawfish-themes/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	karma@ez.pereslavl.ru
 COMMENT=	Themes for Sawfish window manager
 
-RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish2
+RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
 
 USE_X_PREFIX=	yes
 
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index e6b3b92fb8a7..4d8d6ef0cbe8 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -88,7 +88,7 @@
     SUBDIR += ratmenu
     SUBDIR += ratpoison
     SUBDIR += sapphire
-    SUBDIR += sawfish2
+    SUBDIR += sawfish
     SUBDIR += selectwm
     SUBDIR += skippy
     SUBDIR += skippy-xd
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index a07475308eaf..a4568813f183 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -15,8 +15,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ebert@informatik.unibw-muenchen.de
 COMMENT=	A pager for sawfish without GNOME
 
-BUILD_DEPENDS=	${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish2
-RUN_DEPENDS=	${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish2
+BUILD_DEPENDS=	${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish
+RUN_DEPENDS=	${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish
 
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish/Makefile
index 7dd5cfd7103d..d0ed1c41e51e 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sawfish2
+PORTNAME=	sawfish
 PORTVERSION=	1.3
 PORTREVISION=	12
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sawmill
-DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish/distinfo
index 558034bc95fe..558034bc95fe 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish/distinfo
diff --git a/x11-wm/sawfish2/files/patch-ae b/x11-wm/sawfish/files/patch-ae
index 9ad8909b2ac8..9ad8909b2ac8 100644
--- a/x11-wm/sawfish2/files/patch-ae
+++ b/x11-wm/sawfish/files/patch-ae
diff --git a/x11-wm/sawfish2/files/patch-af b/x11-wm/sawfish/files/patch-af
index baaf30e26c3a..baaf30e26c3a 100644
--- a/x11-wm/sawfish2/files/patch-af
+++ b/x11-wm/sawfish/files/patch-af
diff --git a/x11-wm/sawfish2/files/patch-ag b/x11-wm/sawfish/files/patch-ag
index 84c9ff349bdd..84c9ff349bdd 100644
--- a/x11-wm/sawfish2/files/patch-ag
+++ b/x11-wm/sawfish/files/patch-ag
diff --git a/x11-wm/sawfish2/files/patch-configure b/x11-wm/sawfish/files/patch-configure
index 0ab207a9c96b..0ab207a9c96b 100644
--- a/x11-wm/sawfish2/files/patch-configure
+++ b/x11-wm/sawfish/files/patch-configure
diff --git a/x11-wm/sawfish2/files/patch-functions.c b/x11-wm/sawfish/files/patch-functions.c
index ac580c26c823..ac580c26c823 100644
--- a/x11-wm/sawfish2/files/patch-functions.c
+++ b/x11-wm/sawfish/files/patch-functions.c
diff --git a/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
index 46e326127409..232fd5e6bc62 100644
--- a/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
+++ b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/x11-wm/sawfish/files/Attic/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl,v 1.1 2006-05-29 06:23:01 mezz Exp $
 
 --- lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:16:50	1.1
 +++ lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:17:07
diff --git a/x11-wm/sawfish2/files/patch-lisp::sawfish::wm::state::wm-spec.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl
index c51fd1a5a8bd..c51fd1a5a8bd 100644
--- a/x11-wm/sawfish2/files/patch-lisp::sawfish::wm::state::wm-spec.jl
+++ b/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl
diff --git a/x11-wm/sawfish2/files/patch-sawmill.h b/x11-wm/sawfish/files/patch-sawmill.h
index 6c044e3638b7..6c044e3638b7 100644
--- a/x11-wm/sawfish2/files/patch-sawmill.h
+++ b/x11-wm/sawfish/files/patch-sawmill.h
diff --git a/x11-wm/sawfish2/files/patch-scripts_sawfish-menu.jl b/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl
index af52f34579a5..af52f34579a5 100644
--- a/x11-wm/sawfish2/files/patch-scripts_sawfish-menu.jl
+++ b/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl
diff --git a/x11-wm/sawfish2/files/patch-src_fonts.c b/x11-wm/sawfish/files/patch-src_fonts.c
index efcdf25019fa..efcdf25019fa 100644
--- a/x11-wm/sawfish2/files/patch-src_fonts.c
+++ b/x11-wm/sawfish/files/patch-src_fonts.c
diff --git a/x11-wm/sawfish2/pkg-descr b/x11-wm/sawfish/pkg-descr
index 0fba3f92c0f4..0fba3f92c0f4 100644
--- a/x11-wm/sawfish2/pkg-descr
+++ b/x11-wm/sawfish/pkg-descr
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish/pkg-plist
index 28cb4449e642..28cb4449e642 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist