Update to 1.1.

5 files changed, 50 insertions, 10 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index e3ab880a7cc7..8fe128b0adea 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -6,11 +6,14 @@
 #
 
 PORTNAME=	sawfish
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/sawfish
-#DIST_SUBDIR=	gnome
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	sawmill
+#MASTER_SITES=	${MASTER_SITE_GNOME}
+#MASTER_SITE_SUBDIR=	stable/sources/sawfish
+DIST_SUBDIR=	gnome
+DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk1
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/x11-wm/sawfish/distinfo b/x11-wm/sawfish/distinfo
index 705cfda9c8f6..3fa50c6c8803 100644
--- a/x11-wm/sawfish/distinfo
+++ b/x11-wm/sawfish/distinfo
@@ -1 +1 @@
-MD5 (sawfish-1.0.1.tar.gz) = b1587ea76cca08ec951f2536c17a307e
+MD5 (gnome/sawfish-1.1-gtk1.tar.gz) = 2e774169bead8b1a496090c80014e75e
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::i18n.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::i18n.jl
new file mode 100644
index 000000000000..c723c1fc5f66
--- /dev/null
+++ b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::i18n.jl
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lisp/sawfish/ui/i18n.jl	2002/07/01 07:59:43	1.1
++++ lisp/sawfish/ui/i18n.jl	2002/07/01 07:59:56
+@@ -59,6 +59,6 @@
+       (let ((locale-dir (wm-locale-dir)))
+ 	(when locale-dir
+ 	  (bindtextdomain "sawfish" locale-dir)
+-	  (when (boundp 'bindtextdomaincodeset)
+-	    (bindtextdomaincodeset "sawfish" "UTF-8"))
++;;	  (when (boundp 'bindtextdomaincodeset)
++;;	    (bindtextdomaincodeset "sawfish" "UTF-8"))
+ 	  (textdomain "sawfish"))))))
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::wm.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::wm.jl
new file mode 100644
index 000000000000..3332943003e2
--- /dev/null
+++ b/x11-wm/sawfish/files/patch-lisp::sawfish::wm.jl
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- lisp/sawfish/wm.jl.orig	Tue May  7 06:35:59 2002
++++ lisp/sawfish/wm.jl	Mon Jul  1 11:16:13 2002
+@@ -46,8 +46,8 @@
+     (when (and lang (not disable-nls) (not (string= lang "C")))
+       (require 'rep.i18n.gettext)
+       (bindtextdomain "sawfish" sawfish-locale-directory)
+-      (when (boundp 'bindtextdomaincodeset)
+-	(bindtextdomaincodeset "sawfish" "UTF-8"))
++;;      (when (boundp 'bindtextdomaincodeset)
++;;	(bindtextdomaincodeset "sawfish" "UTF-8"))
+       (textdomain "sawfish"))))
+ 
+ ;; ignore file errors on stdio streams
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 13d7f3060fea..a53d527dce5b 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -11,8 +11,8 @@ info/sawfish.info-3
 info/sawfish.info-4
 info/sawfish.info-5
 @exec install-info --section="X11 window manager" --entry="* sawfish: (sawfish).           sawfish programming manual" %D/info/sawfish.info %D/info/dir
-libexec/rep/%%GNUHOST%%/sawfish/client.so
 libexec/rep/%%GNUHOST%%/sawfish/client.la
+libexec/rep/%%GNUHOST%%/sawfish/client.so
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/DOC
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/gradient.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/gradient.so
@@ -40,7 +40,6 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so
 %%GNOME:%%share/gnome/apps/Settings/Sawfish/focus-properties.desktop
 %%GNOME:%%share/gnome/apps/Settings/Sawfish/match-properties.desktop
 %%GNOME:%%share/gnome/apps/Settings/Sawfish/maximize-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/meta-properties.desktop
 %%GNOME:%%share/gnome/apps/Settings/Sawfish/misc-properties.desktop
 %%GNOME:%%share/gnome/apps/Settings/Sawfish/move-properties.desktop
 %%GNOME:%%share/gnome/apps/Settings/Sawfish/placement-properties.desktop
@@ -53,7 +52,6 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so
 %%GNOME:%%share/gnome/control-center/Sawfish/focus-properties.desktop
 %%GNOME:%%share/gnome/control-center/Sawfish/match-properties.desktop
 %%GNOME:%%share/gnome/control-center/Sawfish/maximize-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/meta-properties.desktop
 %%GNOME:%%share/gnome/control-center/Sawfish/misc-properties.desktop
 %%GNOME:%%share/gnome/control-center/Sawfish/move-properties.desktop
 %%GNOME:%%share/gnome/control-center/Sawfish/placement-properties.desktop
@@ -73,6 +71,7 @@ share/gnome/pixmaps/sawfish-logo.png
 %%GNOME:%%share/gnome/pixmaps/sawfish-workspaces.png
 %%GNOME:%%share/gnome/wm-properties/Sawfish.desktop
 share/locale/az/LC_MESSAGES/sawfish.mo
+share/locale/bg/LC_MESSAGES/sawfish.mo
 share/locale/ca/LC_MESSAGES/sawfish.mo
 share/locale/cs/LC_MESSAGES/sawfish.mo
 share/locale/da/LC_MESSAGES/sawfish.mo
@@ -80,6 +79,8 @@ share/locale/de/LC_MESSAGES/sawfish.mo
 share/locale/el/LC_MESSAGES/sawfish.mo
 share/locale/en_GB/LC_MESSAGES/sawfish.mo
 share/locale/es/LC_MESSAGES/sawfish.mo
+share/locale/et/LC_MESSAGES/sawfish.mo
+share/locale/eu/LC_MESSAGES/sawfish.mo
 share/locale/fi/LC_MESSAGES/sawfish.mo
 share/locale/fr/LC_MESSAGES/sawfish.mo
 share/locale/ga/LC_MESSAGES/sawfish.mo
@@ -88,7 +89,10 @@ share/locale/hu/LC_MESSAGES/sawfish.mo
 share/locale/it/LC_MESSAGES/sawfish.mo
 share/locale/ja/LC_MESSAGES/sawfish.mo
 share/locale/ko/LC_MESSAGES/sawfish.mo
+share/locale/lv/LC_MESSAGES/sawfish.mo
+share/locale/ms/LC_MESSAGES/sawfish.mo
 share/locale/nl/LC_MESSAGES/sawfish.mo
+share/locale/nn/LC_MESSAGES/sawfish.mo
 share/locale/no/LC_MESSAGES/sawfish.mo
 share/locale/pl/LC_MESSAGES/sawfish.mo
 share/locale/pt/LC_MESSAGES/sawfish.mo
@@ -100,6 +104,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
@@ -187,6 +192,8 @@ share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/pair.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/pair.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/program.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/program.jlc
+share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/scheme-boolean.jl
+share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/scheme-boolean.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/apply.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/apply.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/config.jl
@@ -205,8 +212,6 @@ share/sawfish/%%VERSION%%/lisp/sawfish/ui/shell.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/shell.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/slot.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/slot.jlc
-share/sawfish/%%VERSION%%/lisp/sawfish/ui/user-level.jl
-share/sawfish/%%VERSION%%/lisp/sawfish/ui/user-level.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/command.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/command.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/event.jl
@@ -404,6 +409,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