11 files changed, 65 insertions, 97 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index b063aa15609d..1312f214fab5 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -7,15 +7,14 @@
 #
 
 PORTNAME=	sawfish
-PORTVERSION=	1.3
-PORTREVISION=	16
+PORTVERSION=	1.3.3
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	sawmill
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	gnome@FreeBSD.org
+MAINTAINER=	anray@FreeBSD.org
 COMMENT=	Lisp configurable window manager
 
 LIB_DEPENDS=	rep.13:${PORTSDIR}/lang/librep
@@ -28,11 +27,13 @@ PLIST_SUB=	GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomehack esound
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-readline \
-		--localstatedir=${PREFIX}/share \
+
+CONFIGURE_SCRIPT=	autogen.sh
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share \
 		--enable-capplet \
 		--disable-themer \
@@ -44,8 +45,6 @@ CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 INFO=		sawfish
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|prog_name|program_name|g' \
 	    	${WRKSRC}/src/main.c
 
diff --git a/x11-wm/sawfish/distinfo b/x11-wm/sawfish/distinfo
index 558034bc95fe..8382d932f7de 100644
--- a/x11-wm/sawfish/distinfo
+++ b/x11-wm/sawfish/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sawfish-1.3.tar.gz) = 9e5ce5e76c60acecdb1889c1f173295a
-SHA256 (gnome2/sawfish-1.3.tar.gz) = c53cd96d03c584cf3570cb92fc03c8b2af4e68fa86f19259535d4a7b178faa87
-SIZE (gnome2/sawfish-1.3.tar.gz) = 1582279
+MD5 (gnome2/sawfish-1.3.3.tar.gz) = 456724c79ddb0b78d03d45dcaffa4103
+SHA256 (gnome2/sawfish-1.3.3.tar.gz) = 3040baecd4a521f02067fef5de9e4e03f4eeb95ce2d29dfdabbdca62ccfedb30
+SIZE (gnome2/sawfish-1.3.3.tar.gz) = 1805122
diff --git a/x11-wm/sawfish/files/patch-configure b/x11-wm/sawfish/files/patch-configure
deleted file mode 100644
index 0ab207a9c96b..000000000000
--- a/x11-wm/sawfish/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Tue Nov 12 16:10:53 2002
-+++ configure	Tue Nov 12 16:12:11 2002
-@@ -2688,7 +2688,7 @@
-   (error
-     (throw 'quit 1)))
- EOF
--if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
-+if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
-   echo "$ac_t""yes" 1>&6
- else
-   echo "$ac_t""no" 1>&6
-@@ -3387,7 +3387,7 @@
- if test "$enable_themer" = yes; then
-     echo $ac_n "checking for rep-gtk libglade wrapper""... $ac_c" 1>&6
- echo "configure:3390: checking for rep-gtk libglade wrapper" >&5
--  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
-+   if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then
-     echo "$ac_t""yes" 1>&6
-     add_subdir "themer"
-   else 
diff --git a/x11-wm/sawfish/files/patch-configure.in b/x11-wm/sawfish/files/patch-configure.in
new file mode 100644
index 000000000000..59959371f208
--- /dev/null
+++ b/x11-wm/sawfish/files/patch-configure.in
@@ -0,0 +1,20 @@
+--- configure.in.orig	2007-07-27 15:43:23.000000000 +0300
++++ configure.in	2007-11-24 00:39:45.000000000 +0200
+@@ -159,7 +159,7 @@
+   (error
+     (throw 'quit 1)))
+ EOF
+-if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
++if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
+   AC_MSG_RESULT([yes])
+ else
+   AC_MSG_RESULT([no])
+@@ -264,7 +264,7 @@
+ if test "$enable_themer" = yes; then
+   dnl configure redirects &5 to config.log
+   AC_MSG_CHECKING([for rep-gtk libglade wrapper])
+-  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
++  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then 
+     AC_MSG_RESULT([yes])
+     add_subdir "themer"
+   else 
diff --git a/x11-wm/sawfish/files/patch-functions.c b/x11-wm/sawfish/files/patch-functions.c
deleted file mode 100644
index ac580c26c823..000000000000
--- a/x11-wm/sawfish/files/patch-functions.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/functions.c 3 Nov 2002 21:00:36 -0000       1.98
-+++ src/functions.c 30 Oct 2003 05:35:18 -0000      1.99
-@@ -704,8 +704,10 @@
-	    repv name;
-	    if (type == XA_ATOM && (name = x_atom_symbol (l_data[i])) != Qnil)
-		rep_VECTI(ret_data, i) = name;
-+	    else if (type == XA_INTEGER)
-+		rep_VECTI(ret_data, i) = rep_make_long_int((long) l_data[i]);
-	    else
--		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i]);
-+		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i] & 0xffffffffUL);
-	}
-	break;
-     }
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl
deleted file mode 100644
index c51fd1a5a8bd..000000000000
--- a/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- lisp/sawfish/wm/state/wm-spec.jl.orig	Sun Sep 28 22:51:20 2003
-+++ lisp/sawfish/wm/state/wm-spec.jl	Sun Sep 28 22:52:10 2003
-@@ -125,7 +125,7 @@
-      _NET_WM_WINDOW_TYPE_UTILITY
-      _NET_WM_WINDOW_TYPE_SPLASH])
-   
--  (defvar wm-spec-below-depth +2)
-+  (defvar wm-spec-below-depth -2)
-   (defvar wm-spec-above-depth +2)
- 
-   (define supported-states '())
diff --git a/x11-wm/sawfish/files/patch-sawmill.h b/x11-wm/sawfish/files/patch-sawmill.h
deleted file mode 100644
index 6c044e3638b7..000000000000
--- a/x11-wm/sawfish/files/patch-sawmill.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sawmill.h.orig      Mon Jan 13 05:35:23 2003
-+++ src/sawmill.h   Mon May  8 11:52:40 2006
-@@ -153,7 +153,7 @@
-     /* Frame data */
-     Window frame;
-     struct frame_part *frame_parts;
--    u_int frame_x, frame_y;		/* relative to client-window */
-+    int frame_x, frame_y;		/* relative to client-window */
-     u_int frame_width, frame_height;
-     void (*destroy_frame)(struct lisp_window *w);
-     void (*focus_change)(struct lisp_window *w);
diff --git a/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl b/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl
deleted file mode 100644
index af52f34579a5..000000000000
--- a/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/sawfish-menu.jl.orig	Tue May 20 11:49:42 2003
-+++ scripts/sawfish-menu.jl	Tue May 20 11:50:54 2003
-@@ -106,7 +106,8 @@
-     (g-signal-connect menu "deactivate" gtk-main-quit)
-     (setq menu-selected nil)
-     (gtk-menu-popup-interp menu nil nil 0 (or timestamp 0) position)
--    (gtk-main)
-+    (when (memq 'visible (GTK-WIDGET-FLAGS menu))
-+      (gtk-main))
-     menu-selected))
- 
- 
diff --git a/x11-wm/sawfish/files/patch-src_fonts.c b/x11-wm/sawfish/files/patch-src_fonts.c
deleted file mode 100644
index efcdf25019fa..000000000000
--- a/x11-wm/sawfish/files/patch-src_fonts.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fonts.c.orig	Sun Nov  3 22:00:36 2002
-+++ src/fonts.c	Wed Feb  8 04:22:13 2006
-@@ -131,7 +131,7 @@
- 	    if (end == 0)
- 		end = p + strlen (p);
- 	    len = end - (p + 1);
--	    buf = malloc (len);
-+	    buf = malloc (len + 1);
- 	    memcpy (buf, p + 1, len);
- 	    buf[len] = 0;
- 	    return buf;
diff --git a/x11-wm/sawfish/pkg-descr b/x11-wm/sawfish/pkg-descr
index 0fba3f92c0f4..a4f292226fa0 100644
--- a/x11-wm/sawfish/pkg-descr
+++ b/x11-wm/sawfish/pkg-descr
@@ -1,3 +1,20 @@
-Lisp configurable window manager
+Sawfish is an extensible window manager using a Lisp-based scripting
+language. Its policy is very minimal compared to most window managers.
+Its aim is simply to manage windows in the most flexible and attractive
+manner possible. All high-level WM functions are implemented in Lisp
+for future extensibility or redefinition.
 
-WWW: http://sawmill.sourceforge.net/
+These are some of the features that set Sawfish apart from other window
+managers:
+
+* Powerful key-binding: Virtually every functionality provided by Sawfish
+  can be bound to keys (or mouse buttons).
+* Event hooking: For many events (moving windows etc.) you can customize
+  the way Sawfish will respond.
+* Window matching: When windows are created you can match them to a set
+  of rules and automatically perform actions on them.
+* Flexible theming: Sawfish allows for very different themes to be created
+  and a variety of third-party themes is readily available
+		
+
+WWW: http://sawfish.wikia.com/
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 364b03deaea3..38f587299868 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -47,6 +47,7 @@ share/pixmaps/sawfish-tooltips.png
 share/pixmaps/sawfish-workspaces.png
 share/gnome/wm-properties/Sawfish.desktop
 share/locale/am/LC_MESSAGES/sawfish.mo
+share/locale/ar/LC_MESSAGES/sawfish.mo
 share/locale/az/LC_MESSAGES/sawfish.mo
 share/locale/be/LC_MESSAGES/sawfish.mo
 share/locale/bg/LC_MESSAGES/sawfish.mo
@@ -55,7 +56,9 @@ share/locale/ca/LC_MESSAGES/sawfish.mo
 share/locale/cs/LC_MESSAGES/sawfish.mo
 share/locale/da/LC_MESSAGES/sawfish.mo
 share/locale/de/LC_MESSAGES/sawfish.mo
+share/locale/dz/LC_MESSAGES/sawfish.mo
 share/locale/el/LC_MESSAGES/sawfish.mo
+share/locale/en_CA/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
@@ -69,17 +72,25 @@ 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/mk/LC_MESSAGES/sawfish.mo
 share/locale/ms/LC_MESSAGES/sawfish.mo
+share/locale/nb/LC_MESSAGES/sawfish.mo
+share/locale/ne/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/oc/LC_MESSAGES/sawfish.mo
+share/locale/pa/LC_MESSAGES/sawfish.mo
 share/locale/pl/LC_MESSAGES/sawfish.mo
 share/locale/pt/LC_MESSAGES/sawfish.mo
 share/locale/pt_BR/LC_MESSAGES/sawfish.mo
 share/locale/ro/LC_MESSAGES/sawfish.mo
 share/locale/ru/LC_MESSAGES/sawfish.mo
+share/locale/rw/LC_MESSAGES/sawfish.mo
 share/locale/sk/LC_MESSAGES/sawfish.mo
 share/locale/sl/LC_MESSAGES/sawfish.mo
+share/locale/sr/LC_MESSAGES/sawfish.mo
+share/locale/sr@Latn/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
@@ -641,8 +652,8 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 %%DATADIR%%/%%VERSION%%/themes/smaker/theme.jl
 @exec mkdir -p %D/%%DATADIR%%/sounds
 @exec mkdir -p %D/%%DATADIR%%/themes
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/sounds
+@dirrmtry %%DATADIR%%/themes
+@dirrmtry %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/%%VERSION%%/themes/smaker
 @dirrm %%DATADIR%%/%%VERSION%%/themes/simple
 @dirrm %%DATADIR%%/%%VERSION%%/themes/mono
@@ -652,7 +663,7 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 @dirrm %%DATADIR%%/%%VERSION%%/themes/brushed-metal
 @dirrm %%DATADIR%%/%%VERSION%%/themes/absolute-e
 @dirrm %%DATADIR%%/%%VERSION%%/themes/Crux
-@dirrm %%DATADIR%%/%%VERSION%%/themes
+@dirrmtry %%DATADIR%%/%%VERSION%%/themes
 @dirrm %%DATADIR%%/%%VERSION%%/sounds
 @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/util
 @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/theming
@@ -671,8 +682,8 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk
 @dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish
 @dirrm %%DATADIR%%/%%VERSION%%/lisp
-@dirrm %%DATADIR%%/%%VERSION%%
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/%%VERSION%%
+@dirrmtry %%DATADIR%%
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish