- update ratpoison to 1.4.0

- enable history (from Matthias Kilian) ok naddy and MAINTAINER
2006-09-27 20:12:14 +00:00 · 2006-09-27 20:12:14 +00:00 · 58986f098a
commit 58986f098a
parent 36da4179bd
9 changed files with 60 additions and 155 deletions
--- a/x11/ratpoison/Makefile
+++ b/x11/ratpoison/Makefile
@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2005/11/13 13:19:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2006/09/27 20:12:14 jasper Exp $

 COMMENT=	"minimal wm based on GNU screen"

-DISTNAME=	ratpoison-1.3.0
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	ratpoison-1.4.0
 CATEGORIES=	x11
 HOMEPAGE=	http://www.nongnu.org/ratpoison/

@ -14,15 +13,16 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xinerama c
+WANTLIB=		X11 Xext Xinerama Xtst c curses readline

 MASTER_SITES=	http://savannah.nongnu.org/download/ratpoison/ \
 		http://openbsd.rutgers.edu/

 USE_X11=		Yes

-CONFIGURE_STYLE=	gnu
+AUTOCONF_VERSION=	2.59
+CONFIGURE_STYLE=	gnu autoconf

-CONFIGURE_ARGS+=	--with-xterm=${X11BASE}/bin/xterm --disable-history
+CONFIGURE_ARGS+=	--with-xterm=${X11BASE}/bin/xterm

 .include <bsd.port.mk>
--- a/x11/ratpoison/distinfo
+++ b/x11/ratpoison/distinfo
@ -1,4 +1,4 @@
-MD5 (ratpoison-1.3.0.tar.gz) = 75541248c355a3f1e09e864dd23a43f4
-RMD160 (ratpoison-1.3.0.tar.gz) = 386f600abbf80b83e221b75c51b5fa0b9dc88f7a
-SHA1 (ratpoison-1.3.0.tar.gz) = 410a95d853fcd9f8ad55e83bf2324dcd6bf13a27
-SIZE (ratpoison-1.3.0.tar.gz) = 309754
+MD5 (ratpoison-1.4.0.tar.gz) = 358abef81387f2d554f4a397dee968b1
+RMD160 (ratpoison-1.4.0.tar.gz) = 723f3d4fb92a4ff7bec48062fa179bddd3eafe42
+SHA1 (ratpoison-1.4.0.tar.gz) = c15d8f52490aef6859edc32799194ae3f32b45cf
+SIZE (ratpoison-1.4.0.tar.gz) = 375793
--- a/x11/ratpoison/patches/patch-configure
+++ b/x11/ratpoison/patches/patch-configure
@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2004/07/21 02:08:05 jcs Exp $
--- configure.orig	Mon Jun 14 01:27:20 2004
-+++ configure	Tue Jul 20 10:08:02 2004
-@@ -2612,10 +2612,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-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
--- a/x11/ratpoison/patches/patch-configure_in
+++ b/x11/ratpoison/patches/patch-configure_in
@ -0,0 +1,29 @@
+$OpenBSD: patch-configure_in,v 1.1 2006/09/27 20:12:14 jasper Exp $
+--- configure.in.orig	Sun Apr  2 21:28:59 2006
+++ configure.in	Wed Aug 16 15:43:46 2006
+@@ -49,10 +49,6 @@ dnl Checks for programs.
+ AC_CHECK_TOOL(CC, gcc)
+ AC_PROG_CC
+ 
+-if test "x$CC" = "xgcc"; then
+-	CFLAGS="$CFLAGS -Wall -O2"
+-fi
+-
+ dnl check for an x terminal emulator
+ AC_MSG_CHECKING(terminal emulator)
+ AC_MSG_RESULT($term_prog)
+@@ -78,10 +74,11 @@ AC_ARG_ENABLE(history,
+ 
+ if test x$check_for_libhistory = xyes ; then
+   AC_CHECK_HEADERS([readline/history.h],
+-    AC_CHECK_LIB(history, add_history,
+-      [LIBS="$LIBS -lhistory"
+    AC_CHECK_LIB(readline, add_history,
+      [LIBS="$LIBS -lreadline -lcurses"
+        AC_DEFINE_UNQUOTED(HAVE_HISTORY, 1, Define this to enable history)],
+-      AC_MSG_WARN([*** Can't find History lib. Install readline dev libs for history.])),
+      AC_MSG_WARN([*** Can't find History lib. Install readline dev libs for history.]),
+      -lcurses),
+     AC_MSG_WARN([*** Can't find History header. Install readline dev libs for history.]))
+ fi
+ 
--- a/x11/ratpoison/patches/patch-contrib_allwindows_sh
+++ b/x11/ratpoison/patches/patch-contrib_allwindows_sh
@ -0,0 +1,18 @@
+$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
+ 
--- a/x11/ratpoison/patches/patch-contrib_rpws
+++ b/x11/ratpoison/patches/patch-contrib_rpws
@ -1,106 +0,0 @@
-$OpenBSD: patch-contrib_rpws,v 1.2 2004/09/30 21:39:58 jcs Exp $
--- contrib/rpws.orig	Sat Aug 23 02:01:51 2003
-+++ contrib/rpws	Thu Sep 30 16:38:48 2004
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
- #
- # Workspaces for ratpoison
- # Copyright (C) 2003 Shawn Betts
-@@ -22,16 +22,13 @@
- # You want more workspaces? Edit this script.
- #
- 
-# FIXME: Currently this depends on bash because I can't figure out how
-# to pass argument to these functions. In bash $1 ... $n are bound to
-# them, not so in plain bourne.
- #
- # Code:
- #
- 
- # This allows outside scripts to tell this script where to find
- # ratpoison.
-if [ -z $RATPOISON ]; then
-+if [ -z "$RATPOISON" ]; then
-     RATPOISON=ratpoison
- fi
- 
-@@ -50,6 +47,9 @@
- {
-     # Backup the frames
-     FS=`rp_call fdump`
-+    if [ -z "$FS" ]; then
-+        exit
-+    fi
-     rp_call select -
-     rp_call only
- 
-@@ -64,7 +64,11 @@
-     # Workspace 1 uses the 'default' group.
-     # Start in workspace 1.
-     rp_call gselect default
-    rp_call setenv fs1 `rp_call fdump`
-+    FDUMP=`rp_call fdump`
-+    if [ -z "$FDUMP" ]; then
-+        exit
-+    fi
-+    rp_call setenv fs1 $FDUMP
-     rp_call setenv ws 1
- 
-     # restore the frames
-@@ -74,19 +78,31 @@
- ws_save ()
- {
-     WS=`rp_call getenv ws`
-    rp_call setenv fs$WS `rp_call fdump`
-+    if [ -z "$WS" ]; then
-+        exit
-+    fi
-+    FDUMP=`rp_call fdump`
-+    if [ -z "$FDUMP" ]; then
-+        exit
-+    fi
-+    rp_call setenv fs$WS $FDUMP
- }
- 
- ws_restore ()
- {
-     ws_save
-    if [ $1 == 1 ]; then
-+    if [ "X${1}" = X"1" ]; then
- 	rp_call gselect default
-     else
- 	rp_call gselect ws$1
-     fi
-+
-+    FS=`rp_call getenv fs$1`
-+    if [ -z "$FS" ]; then
-+	exit
-+    fi
-     rp_call echo Workspace $1
-    rp_call frestore `rp_call getenv fs$1`
-+    rp_call frestore $FS
-     rp_call setenv ws $1
- }
- 
-@@ -102,17 +118,15 @@
-     rp_call bind M-7 exec $0 7
- }
- 
-echo boom >/tmp/boom
-
-if [ -z $@ ]; then
-+if [ -z "$@" ]; 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 == -i ]; then
-+    if [ "X${1}" = X"-i" ]; then
- 	ws_init
-    elif [ $1 == -b ]; then
-+    elif [ "X$1" = X"-b" ]; then
- 	ws_bindings
-     else
- 	ws_restore $1
--- a/x11/ratpoison/patches/patch-src_actions_c
+++ b/x11/ratpoison/patches/patch-src_actions_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_actions_c,v 1.3 2004/08/11 21:24:23 pvalchev Exp $
--- src/actions.c.orig	Wed May 19 23:33:47 2004
-+++ src/actions.c	Wed Aug 11 15:15:45 2004
-@@ -2752,7 +2752,7 @@ cmd_unsetenv (int interactive, char *dat
-     }
- 
-   /* Remove all instances of the env. var. */
-  putenv (data);
-+  unsetenv (data);
- 
-   return NULL;
- }
--- a/x11/ratpoison/patches/patch-src_editor_c
+++ b/x11/ratpoison/patches/patch-src_editor_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_editor_c,v 1.1 2005/11/13 13:19:23 naddy Exp $
--- src/editor.c.orig	Fri Feb 27 08:26:03 2004
-+++ src/editor.c	Wed Nov  9 19:50:46 2005
-@@ -406,7 +406,7 @@ editor_insert (rp_input_line *line, char
-       line->buffer = xrealloc (line->buffer, line->size);
-     }
- 
-  for (i = line->length + nbytes; i > line->position; i--)
-+  for (i = line->length + nbytes; i > line->position && i >= nbytes; i--)
-     line->buffer[i] = line->buffer[i - nbytes];
- 
-   strncpy (&line->buffer[line->position], keysym_buf, nbytes);
--- a/x11/ratpoison/pkg/PLIST
+++ b/x11/ratpoison/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 19:26:31 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2006/09/27 20:12:14 jasper Exp $
 bin/ratpoison
 bin/rpws
@info info/ratpoison.info
@ -16,4 +16,6 @@ share/ratpoison/genrpbindings
 share/ratpoison/ratpoison.el
 share/ratpoison/rpshowall.sh
 share/ratpoison/rpws
+share/ratpoison/sloppy.c
 share/ratpoison/split.sh
+share/ratpoison/unrat.c