4 files changed, 6 insertions, 33 deletions

diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index f47136af27d9..6bb7166387c6 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	sawfish2
-PORTVERSION=	2002.05.02
-PORTREVISION=	1
+PORTVERSION=	2002.05.24
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	sawfish-${PORTVERSION:S/./-/g}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo
index 46cef6cfd163..82877ab811cd 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/sawfish-2002-05-02.tar.bz2) = bb3b6a5dc19257bcbbdf3d8cd97eb8fd
+MD5 (gnome2/sawfish-2002-05-24.tar.bz2) = e6b01c0c7b37e2ecfc27c8b544258d98
diff --git a/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl b/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl
deleted file mode 100644
index 0341e02592b4..000000000000
--- a/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl
+++ /dev/null
@@ -1,29 +0,0 @@
---- lisp/sawfish/wm/gnome/integration.jl.orig	Sat May 25 15:55:29 2002
-+++ lisp/sawfish/wm/gnome/integration.jl	Sat May 25 15:55:31 2002
-@@ -19,8 +19,6 @@
- ;; along with sawmill; see the file COPYING.  If not, write to
- ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--(eval-when-compile (require 'sawfish.wm.commands.xterm))
--
- (define-structure sawfish.wm.gnome.integration ()
- 
-     (open rep
-@@ -28,7 +26,8 @@
- 	  sawfish.wm.gnome.menus
- 	  sawfish.wm.menus
- 	  sawfish.wm.custom
--	  sawfish.wm.commands.help)
-+	  sawfish.wm.commands.help
-+	  sawfish.wm.commands.xterm)
- 
-   (define-structure-alias gnome-int sawfish.wm.gnome.integration)
- 
-@@ -46,6 +45,7 @@
-   (put 'gnome-use-capplet 'custom-obsolete t)
- 
-   ;; invoke the GNOME terminal instead of xterm
-+  (eval-when-compile (require 'sawfish.wm.commands.xterm))
-   (unless (variable-customized-p 'xterm-program)
-     (setq xterm-program "gnome-terminal"))
- 
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index 3eb41eb0391f..15ade8487f06 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -87,6 +87,7 @@ share/locale/sl/LC_MESSAGES/sawfish.mo
 share/locale/sv/LC_MESSAGES/sawfish.mo
 share/locale/tr/LC_MESSAGES/sawfish.mo
 share/locale/uk/LC_MESSAGES/sawfish.mo
+share/locale/vi/LC_MESSAGES/sawfish.mo
 share/locale/wa/LC_MESSAGES/sawfish.mo
 share/locale/zh_CN/LC_MESSAGES/sawfish.mo
 share/locale/zh_TW/LC_MESSAGES/sawfish.mo
@@ -391,6 +392,8 @@ share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/window-outline.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/window-outline.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/with-output.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/with-output.jlc
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/workarea.jl
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/workarea.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/viewport.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/viewport.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/window-anim.jl