Update wm/ratpoison to 1.4.0

patch-aa is no longer necessary: rpws is now a perl script

* Changes since 1.4.0-beta4
- new parameters in frame dumps
:screenh and :screenw specify the size of the screen the frame was on.
- New window format characters
- info takes optional argument and new infofmt setting
- aspect ratio hint honoured
- new hook deletewindow
- _net_wm_pid property supported
- set warp change: the mouse position relative to the window is now used
- new command redo
- new editor bindings C-m and C-h

4 files changed, 11 insertions, 37 deletions

diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile
index e92c9095d1c..990d0d52c47 100644
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/04/08 05:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/08 22:03:08 tonio Exp $
 #
 
-DISTNAME=	ratpoison-1.4.0-beta4
+DISTNAME=	ratpoison-1.4.0
 PKGNAME=	${DISTNAME:S/-beta/beta/}
 CATEGORIES=	wm
 MASTER_SITES=	http://savannah.nongnu.org/download/ratpoison/
@@ -14,10 +14,8 @@ GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	YES
 INFO_FILES=		# PLIST
 
-REPLACE_INTERPRETER+=	bash
-REPLACE.bash.old=	/usr/bin/env bash
-REPLACE.bash.new=	${SH}
-REPLACE_FILES.bash=	contrib/rpws
+USE_TOOLS+=	perl:run
+REPLACE_PERL+=	contrib/rpws contrib/clickframe.pl
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/wm/ratpoison/PLIST b/wm/ratpoison/PLIST
index 978f1da198c..152c99b508a 100644
--- a/wm/ratpoison/PLIST
+++ b/wm/ratpoison/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/08 05:02:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/08 22:03:08 tonio Exp $
 bin/ratpoison
 bin/rpws
 info/ratpoison.info
@@ -14,6 +14,8 @@ share/ratpoison/genrpbindings
 share/ratpoison/ratpoison.el
 share/ratpoison/rpshowall.sh
 share/ratpoison/rpws
+share/ratpoison/sloppy.c
 share/ratpoison/split.sh
+share/ratpoison/unrat.c
 @dirrm share/ratpoison
 @dirrm share/doc/ratpoison
diff --git a/wm/ratpoison/distinfo b/wm/ratpoison/distinfo
index 85bae164d1f..1f9336c6585 100644
--- a/wm/ratpoison/distinfo
+++ b/wm/ratpoison/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/03/09 14:50:31 ghen Exp $
+$NetBSD: distinfo,v 1.10 2006/04/08 22:03:08 tonio Exp $
 
-SHA1 (ratpoison-1.4.0-beta4.tar.gz) = 78d682ae8321040a2ba8ae3f780f07d3c8d464ae
-RMD160 (ratpoison-1.4.0-beta4.tar.gz) = 3e00d661cfcc43b5c75d77f90eb438d97c754976
-Size (ratpoison-1.4.0-beta4.tar.gz) = 373068 bytes
-SHA1 (patch-aa) = f18b28f85dabb73be2ff3f371288326b29aa69be
+SHA1 (ratpoison-1.4.0.tar.gz) = c15d8f52490aef6859edc32799194ae3f32b45cf
+RMD160 (ratpoison-1.4.0.tar.gz) = 723f3d4fb92a4ff7bec48062fa179bddd3eafe42
+Size (ratpoison-1.4.0.tar.gz) = 375793 bytes
diff --git a/wm/ratpoison/patches/patch-aa b/wm/ratpoison/patches/patch-aa
deleted file mode 100644
index 2ea00c187f1..00000000000
--- a/wm/ratpoison/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/03/09 14:50:31 ghen Exp $
-
---- contrib/rpws.orig	2004-11-17 17:27:38.000000000 +0100
-+++ contrib/rpws
-@@ -80,7 +80,7 @@ ws_save ()
- ws_restore ()
- {
-     ws_save
--    if [ $1 == 1 ]; then
-+    if [ $1 = 1 ]; then
- 	rp_call gselect default
-     else
- 	rp_call gselect ws$1
-@@ -108,9 +108,9 @@ if [ -z $@ ]; then
-     echo "$0 -b      -- setup some key bindings"
-     echo "$0 <n>     -- Switch to workspace n"
- else
--    if [ $1 == -i ]; then
-+    if test $1 = -i ; then
- 	ws_init
--    elif [ $1 == -b ]; then
-+    elif test $1 = -b ; then
- 	ws_bindings
-     else
- 	ws_restore $1