--IrhDeMKUP4DT/M7F
Content-Type: multipart/mixed; boundary="SLDf9lqlvOQaIe6s"
Content-Disposition: inline


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

Hi !

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

I include a diff of my working ratpoison, if it can help.

regards,
antoine

On Wed, Jan 26, 2005 at 11:19:08AM -0500, Vladislav Sekulic wrote:
> On Wed, 26 Jan 2005 11:08:34 -0500
> Johnny Lam <jlam@NetBSD.org> wrote:
>=20
> > No, the builtin.mk files should never need to be included by a package
> > Makefile, and I consider it a bug if it's required.  It looks like the
> > problem is that "-lhistory" is being converted into "-ledit", but
> > libedit requires "-ltermcap" to also be on the command line.  I will fix
> > this in readline/builtin.mk.  Your package Makefile should only need to
> > include readline/buildlink3.mk to note that it wants readline functiona=
lity.
>=20
> That makes sense; I'll remove the line.  I recall that Jeremy *did* tell
> me that builtin.mk gets used by buildlink3.mk automatically; I guess I wa=
s=20
> confused by the wording in the pkgsrc guide.
>=20
> Thanks,
> Vlad

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

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 -u -r1.13 Makefile
--- Makefile	17 Apr 2004 20:46:28 -0000	1.13
+++ Makefile	28 Jan 2005 15:41:59 -0000
@@ -1,18 +1,20 @@
 # $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/
 COMMENT=3D	Simple window manager with no fat library dependencies
=20
-USE_BUILDLINK3=3D	YES
-USE_X11=3D	YES
-GNU_CONFIGURE=3D	YES
+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 -u -r1.5 PLIST
--- PLIST	11 Mar 2004 14:23:49 -0000	1.5
+++ PLIST	28 Jan 2005 15:41: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 -u -r1.5 distinfo
--- distinfo	12 Jul 2003 01:37:56 -0000	1.5
+++ distinfo	28 Jan 2005 15:41:59 -0000
@@ -1,4 +1,4 @@
 $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

--SLDf9lqlvOQaIe6s--

--IrhDeMKUP4DT/M7F
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iD8DBQFB+l8w4VqmoGDE/mwRAnVxAJ9PX/3g5eDKK8BDYpO2m86qKTt8GACfZCz7
Gu79EfCbSXpcrwZQpRiUtTg=
=9ni/
-----END PGP SIGNATURE-----

--IrhDeMKUP4DT/M7F--