--fOHHtNG4YXGJ0yqR
Content-Type: multipart/mixed; boundary="gr/z0/N6AeWAPJVB"
Content-Disposition: inline


--gr/z0/N6AeWAPJVB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Oh, while testing, i remembered that rpws (the workspaces tool of
ratpoison) needs /bin/bash.
It was not complicated to make this script work fine with /bin/sh, so i
added a small patch in the patches directory

regards,
antoine


On Fri, Jan 28, 2005 at 04:50:09PM +0100, Antoine Reilles wrote:
> Hi !
>=20
> I spend a few time today trying to update ratpoison, and just realized
> it was already discussed here.
> I arrived to the same point as Vlad and Johnny.
> I have now ratpoison installing fine, on -current=20
>=20
> I include a diff of my working ratpoison, if it can help.
>=20
> regards,
> antoine

--gr/z0/N6AeWAPJVB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ratpoison.diff"
Content-Transfer-Encoding: quoted-printable

? work
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/wm/ratpoison/Makefile,v
retrieving revision 1.13
diff -b -u -r1.13 Makefile
--- Makefile	17 Apr 2004 20:46:28 -0000	1.13
+++ Makefile	28 Jan 2005 16:37:59 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.13 2004/04/17 20:46:28 zuntum Exp $
 #
=20
-DISTNAME=3D	ratpoison-1.2.2
+DISTNAME=3D	ratpoison-1.3.0
 CATEGORIES=3D	wm
-MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE:=3Dratpoison/}
+MASTER_SITES=3Dhttp://savannah.nongnu.org/download/ratpoison/
=20
 MAINTAINER=3D	tech-pkg@NetBSD.org
 HOMEPAGE=3D	http://ratpoison.sourceforge.net/
@@ -12,7 +12,9 @@
 USE_BUILDLINK3=3D	YES
 USE_X11=3D	YES
 GNU_CONFIGURE=3D	YES
+USE_GNU_READLINE=3D YES
=20
 INFO_FILES=3D	ratpoison.info
=20
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/wm/ratpoison/PLIST,v
retrieving revision 1.5
diff -b -u -r1.5 PLIST
--- PLIST	11 Mar 2004 14:23:49 -0000	1.5
+++ PLIST	28 Jan 2005 16:37:59 -0000
@@ -1,13 +1,18 @@
 @comment $NetBSD: PLIST,v 1.5 2004/03/11 14:23:49 seb Exp $
 bin/ratpoison
+bin/rpws
 man/man1/ratpoison.1
 share/doc/ratpoison/AUTHORS
 share/doc/ratpoison/COPYING
 share/doc/ratpoison/ChangeLog
 share/doc/ratpoison/NEWS
 share/doc/ratpoison/README
+share/ratpoison/allwindows.sh
+share/ratpoison/clickframe.pl
 share/ratpoison/genrpbindings
 share/ratpoison/ratpoison.el
+share/ratpoison/rpshowall.sh
+share/ratpoison/rpws
 share/ratpoison/split.sh
 @dirrm share/ratpoison
 @dirrm share/doc/ratpoison
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/wm/ratpoison/distinfo,v
retrieving revision 1.5
diff -b -u -r1.5 distinfo
--- distinfo	12 Jul 2003 01:37:56 -0000	1.5
+++ distinfo	28 Jan 2005 16:37:59 -0000
@@ -1,4 +1,5 @@
 $NetBSD: distinfo,v 1.5 2003/07/12 01:37:56 zuntum Exp $
=20
-SHA1 (ratpoison-1.2.2.tar.gz) =3D 67a62739448fe5015af4a3fd8bf9e6e62674ccd7
-Size (ratpoison-1.2.2.tar.gz) =3D 271298 bytes
+SHA1 (ratpoison-1.3.0.tar.gz) =3D 410a95d853fcd9f8ad55e83bf2324dcd6bf13a27
+Size (ratpoison-1.3.0.tar.gz) =3D 309754 bytes
+SHA1 (patch-aa) =3D fba6e83e42e10fdf0516f53d0fb9574d6afb388c
Index: patches/patch-aa
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-aa	28 Jan 2005 16:37:59 -0000
@@ -0,0 +1,36 @@
+--- contrib/rpws.orig	2005-01-28 17:32:12.000000000 +0100
++++ contrib/rpws	2005-01-28 17:32:22.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Workspaces for ratpoison
+ # Copyright (C) 2003 Shawn Betts
+@@ -80,7 +80,7 @@
+ ws_restore ()
+ {
+     ws_save
+-    if [ $1 =3D=3D 1 ]; then
++    if [ $1 =3D 1 ]; then
+ 	rp_call gselect default
+     else
+ 	rp_call gselect ws$1
+@@ -104,15 +104,15 @@
+=20
+ echo boom >/tmp/boom
+=20
+-if [ -z $@ ]; then
++if test $# -ne 1; then
+     echo "Usage:"
+     echo "$0 -i      -- initialize the workspaces"
+     echo "$0 -b      -- setup some key bindings"
+     echo "$0 <n>     -- Switch to workspace n"
+ else
+-    if [ $1 =3D=3D -i ]; then
++    if test $1 =3D -i	; then
+ 	ws_init
+-    elif [ $1 =3D=3D -b ]; then
++    elif test $1 =3D -b ; then
+ 	ws_bindings
+     else
+ 	ws_restore $1

--gr/z0/N6AeWAPJVB--

--fOHHtNG4YXGJ0yqR
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (NetBSD)

iD8DBQFB+mqP4VqmoGDE/mwRAk+pAJ92H7FY/F/M/b80wDVKM1ul/ydzuACfRES+
xdInn6Kv4M5PCS2cKZRR7pE=
=3/7v
-----END PGP SIGNATURE-----

--fOHHtNG4YXGJ0yqR--