Update to sawfish-1.3. A detailed ChangeLog is not available, but the

major change is that sawfish now uses gtk2 to display it's menus,
and the GNOME 1.x dependency is dropped.

8 files changed, 123 insertions, 174 deletions

diff --git a/wm/sawfish/DESCR b/wm/sawfish/DESCR
index 1eaacd4b59f..b0ec77f5e87 100644
--- a/wm/sawfish/DESCR
+++ b/wm/sawfish/DESCR
@@ -12,6 +12,6 @@ that may be achieved through separate applications.
 
 All high-level wm functions are implemented in Lisp for future
 extensibility or redefinition. Currently this includes menus (using
-GTK+), interactive window moving and resizing, virtual workspaces,
+GTK2+), interactive window moving and resizing, virtual workspaces,
 iconification, focus/transient window policies, frame theme definitions
 and much more.
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 85f65aeddbd..cf6511ab36a 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,29 +1,50 @@
-# $NetBSD: Makefile,v 1.40 2007/02/02 19:32:12 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2007/05/09 10:09:45 tnn Exp $
 #
 
-PKGNAME=		sawfish-${SF_VERS}
-PKGREVISION=		14
+DISTNAME=		sawfish-${SF_VERS}
+SF_VERS=		1.3
+CATEGORIES=		x11 wm
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sawmill/}
 
-COMMENT=		GNOME-aware window manager that is fully configurable in Lisp
+MAINTAINER=		tnn@NetBSD.org
+HOMEPAGE=		http://sawmill.sourceforge.net/
+COMMENT=		Extensible window manager that is fully configurable in Lisp
 
-DEPENDS+=		sawfish-replibs-${SF_VERS}{,nb*}:../../wm/sawfish-replibs
+DEPENDS+=		rep-gtk2>=0.18:../../x11/rep-gtk2
 
-USE_DIRS+=		xdg-1.1
-USE_X11BASE=		yes
+CONFLICTS+=		sawfish-replibs-[0-9]*
+CONFLICTS+=		sawfish-themes-[0-9]*
 
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+CONFIGURE_ENV+=		REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q}
+MAKE_ENV+=		REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q}
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-themer
 
-USE_LIBTOOL=		yes
-USE_TOOLS+=		makeinfo msgfmt
-INFO_FILES=		# PLIST
+USE_TOOLS+=		gmake makeinfo msgfmt
+USE_DIRS+=		gnome2-1.5
+USE_PKGLOCALEDIR=	yes
 
+INFO_FILES=		YES
 PLIST_SUBST+=		SF_VERS=${SF_VERS:Q}
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/sawfish/themes
-	${TOUCH} ${PREFIX}/share/sawfish/themes/.directory
-	${INSTALL_DATA_DIR} ${PREFIX}/share/sawfish/sounds
-	${TOUCH} ${PREFIX}/share/sawfish/sounds/.directory
-
-.include "../../wm/sawfish/Makefile.common"
+SUBST_CLASSES+=		env
+SUBST_STAGE.env=	pre-configure
+SUBST_FILES.env=	lisp/sawfish/ui/main.jl.in po/sawfish-xgettext
+SUBST_FILES.env+=	scripts/sawfish-*.jl* themer/themer.in
+SUBST_SED.env=		-e 's,exec rep,exec env ${REP_ENV_PKGSRC} rep,g'
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && empty(${OS_VERSION:M1.*})
+REP_ENV_PKGSRC=		LD_PRELOAD=/usr/lib/libpthread.so
+.else
+REP_ENV_PKGSRC=
+.endif
+
+.include "../../audio/esound/buildlink3.mk"
+.include "../../lang/librep/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index 6ce463a1bdb..d2bb94817d7 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/05/09 10:09:45 tnn Exp $
 bin/sawfish
-bin/sawfish-capplet
 bin/sawfish-client
-bin/sawfish-themer
 bin/sawfish-ui
 info/sawfish.info
+libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish/client.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/DOC
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gtk-style
@@ -17,32 +16,10 @@ libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/selection.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/x.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/selection.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/x.la
-share/control-center/Sawfish/.directory
-share/control-center/Sawfish/.order
-share/control-center/Sawfish/appearance-properties.desktop
-share/control-center/Sawfish/bindings-properties.desktop
-share/control-center/Sawfish/focus-properties.desktop
-share/control-center/Sawfish/match-properties.desktop
-share/control-center/Sawfish/maximize-properties.desktop
-share/control-center/Sawfish/misc-properties.desktop
-share/control-center/Sawfish/move-properties.desktop
-share/control-center/Sawfish/placement-properties.desktop
-share/control-center/Sawfish/sound-properties.desktop
-share/control-center/Sawfish/workspace-properties.desktop
-share/gnome/apps/Settings/Sawfish/.directory
-share/gnome/apps/Settings/Sawfish/.order
-share/gnome/apps/Settings/Sawfish/appearance-properties.desktop
-share/gnome/apps/Settings/Sawfish/bindings-properties.desktop
-share/gnome/apps/Settings/Sawfish/focus-properties.desktop
-share/gnome/apps/Settings/Sawfish/match-properties.desktop
-share/gnome/apps/Settings/Sawfish/maximize-properties.desktop
-share/gnome/apps/Settings/Sawfish/misc-properties.desktop
-share/gnome/apps/Settings/Sawfish/move-properties.desktop
-share/gnome/apps/Settings/Sawfish/placement-properties.desktop
-share/gnome/apps/Settings/Sawfish/sound-properties.desktop
-share/gnome/apps/Settings/Sawfish/workspace-properties.desktop
 share/gnome/wm-properties/Sawfish.desktop
+share/locale/am/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
 share/locale/bs/LC_MESSAGES/sawfish.mo
 share/locale/ca/LC_MESSAGES/sawfish.mo
@@ -81,18 +58,7 @@ 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
-share/pixmaps/sawfish-appearance.png
-share/pixmaps/sawfish-edgeflip.png
-share/pixmaps/sawfish-focus.png
 share/pixmaps/sawfish-logo.png
-share/pixmaps/sawfish-matched.png
-share/pixmaps/sawfish-minmax.png
-share/pixmaps/sawfish-misc.png
-share/pixmaps/sawfish-moveresize.png
-share/pixmaps/sawfish-placement.png
-share/pixmaps/sawfish-shortcuts.png
-share/pixmaps/sawfish-tooltips.png
-share/pixmaps/sawfish-workspaces.png
 share/sawfish/${SF_VERS}/lisp/anim-outline.jl
 share/sawfish/${SF_VERS}/lisp/anim-outline.jlc
 share/sawfish/${SF_VERS}/lisp/audio-events.jl
@@ -370,10 +336,10 @@ share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/groups.jl
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/groups.jlc
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/gtkrc.jl
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/gtkrc.jlc
-share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/keymap.jl
-share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/keymap.jlc
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/keymap-diff.jl
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/keymap-diff.jlc
+share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/keymap.jl
+share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/keymap.jlc
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/nokogiri.jl
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/nokogiri.jlc
 share/sawfish/${SF_VERS}/lisp/sawfish/wm/util/ping.jl
@@ -434,7 +400,6 @@ share/sawfish/${SF_VERS}/sounds/clicked.wav
 share/sawfish/${SF_VERS}/sounds/gameover.wav
 share/sawfish/${SF_VERS}/sounds/slide.wav
 share/sawfish/${SF_VERS}/sounds/toggled.wav
-share/sawfish/${SF_VERS}/themer.glade
 share/sawfish/${SF_VERS}/themes/Crux/README
 share/sawfish/${SF_VERS}/themes/Crux/README.gl
 share/sawfish/${SF_VERS}/themes/Crux/active:bottom-left-border.png
@@ -646,45 +611,41 @@ share/sawfish/${SF_VERS}/themes/smaker/close_inv.png
 share/sawfish/${SF_VERS}/themes/smaker/min.png
 share/sawfish/${SF_VERS}/themes/smaker/min_inv.png
 share/sawfish/${SF_VERS}/themes/smaker/theme.jl
-share/sawfish/sounds/.directory
-share/sawfish/themes/.directory
-@dirrm share/sawfish/themes
-@dirrm share/sawfish/sounds
-@dirrm share/sawfish/${SF_VERS}/themes/smaker
-@dirrm share/sawfish/${SF_VERS}/themes/simple
-@dirrm share/sawfish/${SF_VERS}/themes/mono
-@dirrm share/sawfish/${SF_VERS}/themes/microGUI
-@dirrm share/sawfish/${SF_VERS}/themes/gtk
-@dirrm share/sawfish/${SF_VERS}/themes/gradient
-@dirrm share/sawfish/${SF_VERS}/themes/brushed-metal
-@dirrm share/sawfish/${SF_VERS}/themes/absolute-e
-@dirrm share/sawfish/${SF_VERS}/themes/Crux
-@dirrm share/sawfish/${SF_VERS}/themes
-@dirrm share/sawfish/${SF_VERS}/sounds
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/util
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/theming
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/state
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/session
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/placement
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/gnome
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/ext
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/commands
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/animation
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/ui/widgets
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/ui/layouts
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/ui
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/gtk/widgets
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/gtk
-@dirrm share/sawfish/${SF_VERS}/lisp/sawfish
-@dirrm share/sawfish/${SF_VERS}/lisp
-@dirrm share/sawfish/${SF_VERS}
-@dirrm share/sawfish
-@dirrm share/gnome/apps/Settings/Sawfish
-@dirrm share/control-center/Sawfish
 @dirrm libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util
 @dirrm libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm
 @dirrm libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish
 @dirrm libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/sawfish/${SF_VERS}
 @dirrm libexec/sawfish
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/gtk/widgets
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/gtk
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/ui/layouts
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/ui/widgets
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/ui
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/animation
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/commands
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/ext
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/gnome
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/placement
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/session
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/state
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/theming
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm/util
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish/wm
+@dirrm share/sawfish/${SF_VERS}/lisp/sawfish
+@dirrm share/sawfish/${SF_VERS}/lisp
+@dirrm share/sawfish/${SF_VERS}/sounds
+@dirrm share/sawfish/${SF_VERS}/themes/Crux
+@dirrm share/sawfish/${SF_VERS}/themes/absolute-e
+@dirrm share/sawfish/${SF_VERS}/themes/brushed-metal
+@dirrm share/sawfish/${SF_VERS}/themes/gradient
+@dirrm share/sawfish/${SF_VERS}/themes/gtk
+@dirrm share/sawfish/${SF_VERS}/themes/microGUI
+@dirrm share/sawfish/${SF_VERS}/themes/mono
+@dirrm share/sawfish/${SF_VERS}/themes/simple
+@dirrm share/sawfish/${SF_VERS}/themes/smaker
+@dirrm share/sawfish/${SF_VERS}/themes
+@dirrm share/sawfish/${SF_VERS}
+@dirrm share/sawfish/sounds
+@dirrm share/sawfish/themes
+@dirrm share/sawfish
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index 19f380b4506..fb75c357b48 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 16:50:50 rillig Exp $
+$NetBSD: distinfo,v 1.10 2007/05/09 10:09:45 tnn Exp $
 
-SHA1 (sawfish-1.2-gtk1.tar.gz) = 03ea1b6aa917db7ec52047c661bbadef8793e74a
-RMD160 (sawfish-1.2-gtk1.tar.gz) = ffe716a8ab7b36e53c58906cd8de74f7600695ca
-Size (sawfish-1.2-gtk1.tar.gz) = 1519847 bytes
-SHA1 (patch-aa) = 68ebcda2da73b32c245844d7b753e6b68e880647
-SHA1 (patch-ab) = 20ffaa03c787c0edaee2cdeea5855395ebb57fdc
-SHA1 (patch-ac) = 0f9558d5c968074d5ecf76534952478f128c2c29
-SHA1 (patch-ad) = aa2a4b382688ec954ff01b1a97299801a42e7c11
+SHA1 (sawfish-1.3.tar.gz) = b631c7b110a09c3a26f071f7a68be7de99575a1c
+RMD160 (sawfish-1.3.tar.gz) = eef3b39bec21b4ede7a1af2fc9aa7714772d7d0c
+Size (sawfish-1.3.tar.gz) = 1582279 bytes
+SHA1 (patch-aa) = 92db44adf5c50a7eac1b9d09794f1a6cdbe42be4
+SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
 SHA1 (patch-ae) = 51325e250aa5cea10203bd215720f2f7f2a32347
diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa
index 0c46598b1a2..4d257164380 100644
--- a/wm/sawfish/patches/patch-aa
+++ b/wm/sawfish/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/10/08 13:22:37 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2007/05/09 10:09:45 tnn Exp $
 
---- configure.orig	Thu Mar 15 08:12:53 2001
+--- configure.orig	2003-03-25 09:30:27.000000000 +0100
 +++ configure
-@@ -657,7 +657,7 @@
+@@ -643,7 +643,7 @@ esac
  
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
@@ -11,3 +11,30 @@ $NetBSD: patch-aa,v 1.4 2002/10/08 13:22:37 wiz Exp $
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  # Extract the first word of "gcc", so it can be a program name with args.
+@@ -2688,7 +2688,7 @@ cat >conftest <<EOF
+   (error
+     (throw 'quit 1)))
+ EOF
+-if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
++if env REP_GTK_DONT_INITIALIZE=1 ${REP_ENV_PKGSRC} rep ./conftest 2>&5; then
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+@@ -3387,7 +3387,7 @@ fi
+ 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 env REP_GTK_DONT_INITIALIZE=1 ${REP_ENV_PKGSRC} rep --batch -l gui.gtk.libglade 2>&5; then 
+     echo "$ac_t""yes" 1>&6
+     add_subdir "themer"
+   else 
+@@ -3408,7 +3408,7 @@ fi
+ if test "$enable_gnome_widgets" != "no"; then
+   echo $ac_n "checking for rep-gtk GNOME wrappers""... $ac_c" 1>&6
+ echo "configure:3411: checking for rep-gtk GNOME wrappers" >&5
+-  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk-2.gnome-ui 2>&5; then 
++  if env REP_GTK_DONT_INITIALIZE=1 ${REP_ENV_PKGSRC} rep --batch -l gui.gtk-2.gnome-ui 2>&5; then 
+     echo "$ac_t""yes" 1>&6
+     REP_GTK_GNOME=yes
+   else 
diff --git a/wm/sawfish/patches/patch-ab b/wm/sawfish/patches/patch-ab
index 4b0ef3354e3..149d9912fdb 100644
--- a/wm/sawfish/patches/patch-ab
+++ b/wm/sawfish/patches/patch-ab
@@ -1,46 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2007/05/09 10:09:45 tnn Exp $
 
---- src/Makefile.in.orig	Fri Sep  1 18:45:15 2000
-+++ src/Makefile.in
-@@ -19,6 +19,9 @@
- # along with sawmill; see the file COPYING.  If not, write to
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+--- Makedefs.in.orig	2003-01-12 21:30:40.000000000 +0100
++++ Makedefs.in
+@@ -98,7 +98,7 @@ REP_MSGFMT=@REP_MSGFMT@
  
-+# Don't build client.la by default from this Makefile.  client.la is
-+# packaged by x11/sawfish-replibs.
-+
- include ../Makedefs
+ # used when compiling/running lisp code
+ REP_ENVIRON=REP_DL_LOAD_PATH=$(top_builddir)/src/.libexec \
+-	    REP_GTK_DONT_INITIALIZE=1
++	    REP_GTK_DONT_INITIALIZE=1 $(REP_ENV_PKGSRC)
  
- top_builddir=..
-@@ -32,7 +35,7 @@
- OBJS := $(SRCS:.c=.o)
- 
- DL_SRCS := gradient.c flippers.c x.c selection.c play-sample.c
--DL_OBJS := $(DL_SRCS:%.c=%.la) client.la
-+DL_OBJS := $(DL_SRCS:%.c=%.la)
- DL_DSTS = sawfish/wm/util/gradient.la sawfish/wm/util/flippers.la \
- 	  sawfish/wm/util/x.la sawfish/wm/util/selection.la \
- 	  sawfish/wm/util/play-sample.la
-@@ -71,6 +74,8 @@
- 	  $(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
- 	  $(notdir $(x)) $(DESTDIR)$(sawfishexecdir)/$(dir $(x));)
- 	$(rep_INSTALL_ALIASES) -c . $(DESTDIR)$(sawfishexecdir)
-+
-+install-client-la : client.la
- 	$(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) client.la $(DESTDIR)$(repexecdir)/sawfish/
- 
- uninstall :
-@@ -82,10 +87,12 @@
- 	for dl in $(DL_DSTS); do \
- 	  $(rep_LIBTOOL) rm $(DESTDIR)${sawfishexecdir}/$$dl; \
- 	done
-+
-+uninstall-client-la :
- 	$(rep_DL_UNINSTALL) $(DESTDIR)$(repexecdir)/sawfish/client.la
- 
- installdirs : mkinstalldirs
--	$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \
-+	$(SHELL) $< $(DESTDIR)$(bindir) \
- 	  $(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x))
- 
- .libexec :
+ %.mo : %.po
+ 	$(REP_MSGFMT) $(MSGFMTFLAGS) -o $@ $<
diff --git a/wm/sawfish/patches/patch-ac b/wm/sawfish/patches/patch-ac
deleted file mode 100644
index 574bc51f8dc..00000000000
--- a/wm/sawfish/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
-
---- src/fake-libexec.orig	Thu Sep 28 08:31:04 2000
-+++ src/fake-libexec
-@@ -6,7 +6,6 @@
- libexecdir="./.libexec"
- 
- libs="\
-- sawfish.client\
-  sawfish.wm.util.flippers\
-  sawfish.wm.util.gradient\
-  sawfish.wm.util.play-sample\
diff --git a/wm/sawfish/patches/patch-ad b/wm/sawfish/patches/patch-ad
deleted file mode 100644
index 62bc5411ce5..00000000000
--- a/wm/sawfish/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/01/18 06:37:02 toshii Exp $
-
---- lisp/sawfish/wm/windows.jl.orig	Mon Nov  4 12:35:38 2002
-+++ lisp/sawfish/wm/windows.jl
-@@ -320,7 +320,7 @@ If HINTS is non-nil, then it is the size
- 	    (t x))))
- 
-   (define (adjust-position-for-gravity/y w grav y #!key inverse)
--    (let* ((tl-off (window-frame-offset w))
-+    (let* ((tl-off (cdr (window-frame-offset w)))
- 	   (br-off (- (cdr (window-frame-dimensions w))
- 		      (cdr (window-dimensions w))))
- 	   (sign (if inverse -1 +1)))