Subject: Re: pkg/28993
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Antoine Reilles <Antoine.Reilles@loria.fr>
List: pkgsrc-bugs
Date: 01/28/2005 17:00:03
The following reply was made to PR pkg/28993; it has been noted by GNATS.
From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/28993
Date: Fri, 28 Jan 2005 17:58:01 +0100
--tjCHc7DPkfUGtrlw
Content-Type: multipart/mixed; boundary="YiEDa0DAkWCtVeE4"
Content-Disposition: inline
--YiEDa0DAkWCtVeE4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Ratpoison 1.3.0 compiles fine using the pkgsrc readline and with
USE_GNU_READLINE=YES. (with NetBSD 2.99.14 Fri Jan 21 15:39:59 CET 2005)
I patched the original rpws which depended on /bin/bash, to use /bin/sh
The PLIST too had to be updated, there are new files.
I include a diff of my ratpoison directory, if it can be useful.
--YiEDa0DAkWCtVeE4
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
--YiEDa0DAkWCtVeE4--
--tjCHc7DPkfUGtrlw
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (NetBSD)
iD8DBQFB+m8Z4VqmoGDE/mwRAg5CAJ9KIoGgpowjRd8RHUEWC+V58oNQugCeLzP7
4li9Ojf7jGeHXiM6qFsk4Nc=
=y9vF
-----END PGP SIGNATURE-----
--tjCHc7DPkfUGtrlw--