4 files changed, 20 insertions, 24 deletions

diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index c251945e64a3..f183d8566405 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sawfish
-PORTVERSION= 	0.29
+PORTVERSION= 	0.30
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sawmill
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo
index 656c1e4a1724..9be5daccfc51 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish2/distinfo
@@ -1 +1 @@
-MD5 (sawfish-0.29.tar.gz) = de1892c61b8924755f1d29f0e284c460
+MD5 (sawfish-0.30.tar.gz) = 1dc5a325a35bca2a3ecb42b1d73c38d8
diff --git a/x11-wm/sawfish2/files/patch-ac b/x11-wm/sawfish2/files/patch-ac
index 93e3b1a4f47c..247219ca0369 100644
--- a/x11-wm/sawfish2/files/patch-ac
+++ b/x11-wm/sawfish2/files/patch-ac
@@ -1,5 +1,5 @@
---- configure.in.orig	Sun Jul  2 18:17:23 2000
-+++ configure.in	Mon Jul  3 13:19:32 2000
+--- configure.in.orig	Sun Jul  9 17:35:13 2000
++++ configure.in	Tue Jul 11 12:54:41 2000
 @@ -57,7 +57,7 @@
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
@@ -9,21 +9,3 @@
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  dnl Checks for programs.
-@@ -108,12 +108,12 @@
-   (error
-     (throw 'quit 1)))
- EOF
--if rep ./conftest 2>&5; then
-+#if rep ./conftest 2>&5; then
-   AC_MSG_RESULT([yes])
--else
--  AC_MSG_RESULT([no])
--  AC_MSG_ERROR([You need rep-gtk version ${rep_gtk_version}+])
--fi
-+#else
-+#  AC_MSG_RESULT([no])
-+#  AC_MSG_ERROR([You need rep-gtk version ${rep_gtk_version}+])
-+#fi
- 
- dnl is X available?
- if test "${no_x}" != "yes"; then
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index 41e4757ee999..77f7d538f7c7 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -39,6 +39,7 @@ share/locale/pt_PT/LC_MESSAGES/sawfish.mo
 share/locale/ru/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
 %%GNOME:%%share/gnome/control-center/Sawfish/.directory
 %%GNOME:%%share/gnome/control-center/Sawfish/.order
 %%GNOME:%%share/gnome/control-center/Sawfish/appearance-properties.desktop
@@ -239,18 +240,21 @@ share/sawfish/%%VERSION%%/lisp/workspace.jl
 share/sawfish/%%VERSION%%/lisp/workspace.jlc
 share/sawfish/%%VERSION%%/lisp/x-cycle.jl
 share/sawfish/%%VERSION%%/lisp/x-cycle.jlc
+share/sawfish/%%VERSION%%/nokogiri/monitor.png
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-apply.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-apply.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-color-preview.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-color-preview.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-config.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-config.jlc
-share/sawfish/%%VERSION%%/nokogiri/nokogiri-dialog.jl
-share/sawfish/%%VERSION%%/nokogiri/nokogiri-dialog.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-gnome.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-gnome.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-group.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-group.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-i18n.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-i18n.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-interfaces.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-interfaces.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-layout.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-layout.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-layouts/keymaps.jl
@@ -273,12 +277,18 @@ share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/alist.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/alist.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/color.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/color.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/command.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/command.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/event.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/event.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/file.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/file.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/font.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/font.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/frame-style.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/frame-style.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/icon.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/icon.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/keymap.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/keymap.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/list.jl
@@ -287,6 +297,10 @@ share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/match-window.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/match-window.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/pair.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/pair.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/program.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/program.jlc
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/workspace-geometry.jl
+share/sawfish/%%VERSION%%/nokogiri/nokogiri-widgets/workspace-geometry.jlc
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-wm.jl
 share/sawfish/%%VERSION%%/nokogiri/nokogiri-wm.jlc
 share/sawfish/%%VERSION%%/sounds/activate.wav