update to ratpoison 1.4.6, from Jeremie Courreges-Anglas,

with input from william@ (maintainer).

x11/ratpoison/Makefile

@@ -1,28 +1,31 @@
-# $OpenBSD: Makefile,v 1.26 2013/03/11 11:46:15 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2013/04/07 20:09:23 sthen Exp $
 
 COMMENT=	minimal wm based on GNU screen
 
-DISTNAME=	ratpoison-1.4.5
+DISTNAME=	ratpoison-1.4.6
 
 CATEGORIES=	x11
 HOMEPAGE=	http://www.nongnu.org/ratpoison/
 
-MAINTAINER=	William Yodlowsky <bsd@openbsd.rutgers.edu>
+MAINTAINER=	William Yodlowsky <william@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += X11 Xext Xft Xinerama Xtst c
+WANTLIB+=		X11 Xext Xft Xinerama Xtst c
 
 MASTER_SITES=		${MASTER_SITE_SAVANNAH:=ratpoison/}
 
-USE_GROFF =		Yes
-
-AUTOCONF_VERSION =	2.61
-
-CONFIGURE_STYLE=	autoconf
-
+SEPARATE_BUILD=		Yes
+USE_GROFF=		Yes
+CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-xterm=${X11BASE}/bin/xterm \
 			--disable-history
 
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mno_shared}
+CONFIGURE_ARGS+=	--without-xft
+CONFIGURE_ENV+=		X_EXTRA_LIBS="-lxcb -lXau -lXdmcp"
+.endif
+
 .include <bsd.port.mk>

x11/ratpoison/distinfo

@@ -1,5 +1,2 @@
-MD5 (ratpoison-1.4.5.tar.gz) = MwoI2+1r6IyrVPaUfp8LYA==
-RMD160 (ratpoison-1.4.5.tar.gz) = ri/AzX71YZRM966gYjh1pxSHcc4=
-SHA1 (ratpoison-1.4.5.tar.gz) = 4yQw3knEq11QFlPAPdGd+2I8sIs=
-SHA256 (ratpoison-1.4.5.tar.gz) = c5EHnbILhhPuz9gdZNJD7cnTxYZ1DI8torudsU0mDwM=
-SIZE (ratpoison-1.4.5.tar.gz) = 427366
+SHA256 (ratpoison-1.4.6.tar.gz) = 6oOW/GnieEF0W49VhGwWK+Re3odaK1C868qCZxcaK/g=
+SIZE (ratpoison-1.4.6.tar.gz) = 460169

x11/ratpoison/patches/patch-Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2012/03/17 14:20:58 fgsch Exp $
---- Makefile.in.orig	Mon Apr 27 02:56:02 2009
-+++ Makefile.in	Fri Mar 16 23:17:37 2012
-@@ -567,7 +567,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-docDATA
-+install-data-am:
- 
- install-dvi: install-dvi-recursive
- 

x11/ratpoison/patches/patch-configure_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.3 2012/03/17 14:20:58 fgsch Exp $
---- configure.in.orig	Fri Mar 16 23:19:39 2012
-+++ configure.in	Fri Mar 16 23:19:42 2012
-@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(unistd.h stdarg.h)
- dnl Checks for typedefs, structures, and compiler characteristics.
- 
- dnl Checks for library functions.
--AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
-+AC_CHECK_FUNCS(getline getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
- 
- AC_TYPE_SIGNAL
- 

x11/ratpoison/patches/patch-contrib_allwindows_sh

@@ -1,18 +0,0 @@
-$OpenBSD: patch-contrib_allwindows_sh,v 1.1 2006/09/27 20:12:14 jasper Exp $
---- contrib/allwindows.sh.orig	Mon Aug 11 07:12:48 2003
-+++ contrib/allwindows.sh	Wed Aug 16 15:44:36 2006
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # Copyright (C) 2003 Rupert Levene
- # Author: Rupert Levene <r.levene@lancaster.ac.uk>
- 
-@@ -12,7 +12,7 @@ IFS='
- list=''
- 
- # Allow external scripts to tell it where ratpoison is
--if [ -z $RATPOISON ]; then
-+if [ -z "$RATPOISON" ]; then
-     RATPOISON=ratpoison
- fi
- 

x11/ratpoison/patches/patch-src_config_h_in

@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_config_h_in,v 1.1 2012/03/17 14:20:58 fgsch Exp $
---- src/config.h.in.orig	Fri Mar 16 23:20:01 2012
-+++ src/config.h.in	Fri Mar 16 23:20:27 2012
-@@ -3,6 +3,9 @@
- /* Define this to enable debugging messages */
- #undef DEBUG
- 
-+/* Define to 1 if you have the `getline' function. */
-+#undef HAVE_GETLINE
-+
- /* Define to 1 if you have the `getopt' function. */
- #undef HAVE_GETOPT
- 

x11/ratpoison/pkg/PLIST

@@ -1,8 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/02/09 18:36:49 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.9 2013/04/07 20:09:23 sthen Exp $
 @bin bin/ratpoison
 bin/rpws
 @info info/ratpoison.info
 @man man/man1/ratpoison.1
+share/doc/ratpoison/
+share/doc/ratpoison/AUTHORS
+share/doc/ratpoison/COPYING
+share/doc/ratpoison/ChangeLog
+share/doc/ratpoison/NEWS
+share/doc/ratpoison/README
 share/ratpoison/
 share/ratpoison/allwindows.sh
 share/ratpoison/clickframe.pl