From 437ba05e0e8e3e75bebffcb1340a34289716ad3c Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Wed, 2 Jul 2003 06:29:15 +0000
Subject: [PATCH] update to ratpoison 1.2.2

- bugfixes
- point it to our xterm by default

from maintainer William Yodlowsky <bsd@openbsd.rutgers.edu>
---
 x11/ratpoison/Makefile                    |  6 ++++--
 x11/ratpoison/distinfo                    |  6 +++---
 x11/ratpoison/patches/patch-configure     | 21 ++++++++++++---------
 x11/ratpoison/patches/patch-src_actions_c | 12 ------------
 4 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 x11/ratpoison/patches/patch-src_actions_c

diff --git a/x11/ratpoison/Makefile b/x11/ratpoison/Makefile
index 728566c12f3..b3485b5856f 100644
--- a/x11/ratpoison/Makefile
+++ b/x11/ratpoison/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2002/07/15 22:04:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2003/07/02 06:29:15 sturm Exp $
 
 COMMENT=	"minimal wm based on GNU screen"
 
-DISTNAME=	ratpoison-1.1.1
+DISTNAME=	ratpoison-1.2.2
 CATEGORIES=	x11
 HOMEPAGE=	http://ratpoison.sourceforge.net/
 
@@ -21,4 +21,6 @@ USE_X11=		Yes
 
 CONFIGURE_STYLE=	gnu
 
+CONFIGURE_ARGS+=	--with-xterm=${X11BASE}/bin/xterm
+
 .include <bsd.port.mk>
diff --git a/x11/ratpoison/distinfo b/x11/ratpoison/distinfo
index c7ea275b6d6..8ecf6b6a94b 100644
--- a/x11/ratpoison/distinfo
+++ b/x11/ratpoison/distinfo
@@ -1,3 +1,3 @@
-MD5 (ratpoison-1.1.1.tar.gz) = 59efd0719b6c3a9f9fcd606df95e5208
-RMD160 (ratpoison-1.1.1.tar.gz) = 173a862fd69137ed64c0e4295687d1dafe0bf215
-SHA1 (ratpoison-1.1.1.tar.gz) = 4d2535adb3d7a287c1fc43c6fe4b498879736824
+MD5 (ratpoison-1.2.2.tar.gz) = 7cc7a1149554b2f76e4c52d5c3592b74
+RMD160 (ratpoison-1.2.2.tar.gz) = 2bc558f4575f2a77f308e13f3f3d236e09b6a416
+SHA1 (ratpoison-1.2.2.tar.gz) = 67a62739448fe5015af4a3fd8bf9e6e62674ccd7
diff --git a/x11/ratpoison/patches/patch-configure b/x11/ratpoison/patches/patch-configure
index 075ad9726b3..672d0695cd6 100644
--- a/x11/ratpoison/patches/patch-configure
+++ b/x11/ratpoison/patches/patch-configure
@@ -1,11 +1,14 @@
-$OpenBSD: patch-configure,v 1.1 2002/07/15 22:04:18 naddy Exp $
---- configure.orig	Mon Jul 15 23:56:06 2002
-+++ configure	Mon Jul 15 23:56:35 2002
-@@ -846,7 +846,6 @@ cat >> confdefs.h <<EOF
- EOF
+$OpenBSD: patch-configure,v 1.2 2003/07/02 06:29:15 sturm Exp $
+--- configure.orig	Mon Jun  9 18:45:35 2003
++++ configure	Tue Jul  1 08:32:58 2003
+@@ -2611,10 +2611,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
--CFLAGS="$CFLAGS -Wall -O2"
- echo $ac_n "checking build system type""... $ac_c" 1>&6
- echo "configure:852: checking build system type" >&5
- 
+-if test "x$CC" = "xgcc"; then
+-	CFLAGS="$CFLAGS -Wall -O2"
+-fi
+-
+ echo "$as_me:$LINENO: checking terminal emulator" >&5
+ echo $ECHO_N "checking terminal emulator... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $term_prog" >&5
diff --git a/x11/ratpoison/patches/patch-src_actions_c b/x11/ratpoison/patches/patch-src_actions_c
deleted file mode 100644
index 116b302548e..00000000000
--- a/x11/ratpoison/patches/patch-src_actions_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_actions_c,v 1.1 2003/02/25 22:39:31 pvalchev Exp $
---- src/actions.c.orig	Sat Jul  6 15:31:27 2002
-+++ src/actions.c	Tue Feb 25 15:34:36 2003
-@@ -2078,7 +2078,7 @@ cmd_defbgcolor (int interactive, void *d
-   return NULL;
- }
- 
--#if !defined(HAVE_SETENV) || !defined(setenv)
-+#if !defined(HAVE_SETENV) && !defined(setenv)
- /* For systems, such as Solaris, where setenv is not implemented
-  * in libc */
- /* FIXME: overwrite has no effect in this implementation! */