Bumped rxvt to a newer version in order to fix compile errors in previous version. Enchanced the ebuild with some new features.

5 files changed, 61 insertions, 46 deletions

diff --git a/x11-terms/rxvt/ChangeLog b/x11-terms/rxvt/ChangeLog
index fbeca6f4189a..413e7c950e2f 100644
--- a/x11-terms/rxvt/ChangeLog
+++ b/x11-terms/rxvt/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-terms/rxvt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.14 2003/03/21 19:53:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.15 2003/03/31 19:47:25 dragon Exp $
+
+*rxvt-2.7.10 (31 Mar 2003)
+
+  31 Mar 2003; Nicholas Wourms <dragon@gentoo.org> rxvt-2.7.10.ebuild,
+  files/digest-rxvt-2.7.10, files/rxvt-2.7.10-azz4.diff:
+  Bumped rxvt to 2.7.10 to fix the compiler error.  Updated ebuild with
+  changes from 2.7.8's ebuild.  Rediffed the motif patch to apply correctly
+  to the new rxvt.  Added new flags --enable-everything & --enable-256-color
+  for a more robust with more color support rxvt.  No errors found during
+  testing.  The ebuild is ~arch masked for now until it is tested further.
+  This fixes bug #16742, as well.
 
 *rxvt-2.7.8-r6 (20 Mar 2003)
 
@@ -13,6 +24,10 @@
 
 *rxvt-2.7.9 (03 Mar 2003)
 
+  31 Mar 2003; Nicholas Wourms <dragon@gentoo.org> rxvt-2.7.9.ebuild,
+  files/digest-rxvt-2.7.9, files/rxvt-2.7.9-azz4.diff:
+  Removed defective rxvt version and associated files.
+
   03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Version bump.
 
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.10 b/x11-terms/rxvt/files/digest-rxvt-2.7.10
new file mode 100644
index 000000000000..ad4bc846fce0
--- /dev/null
+++ b/x11-terms/rxvt/files/digest-rxvt-2.7.10
@@ -0,0 +1,5 @@
+MD5 c86a25e3f580bd3065077fd5782029f4 /files/rxvt-2.7.8-azz4.diff 5032
+MD5 80a958edd8a6f68140bca93f4bdeadbd /files/rxvt-2.7.8-security.patch 1038
+MD5 a38b2f365a55cad915e1e503466ab029 /files/rxvt-2.7.10-azz4.diff 5072
+MD5 0d25606468eb980059b17f68db3912dd /rxvt-2.7.10.ebuild 1106
+MD5 302c5c455e64047b02d1ef19ff749141 rxvt-2.7.10.tar.gz 595073
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.9 b/x11-terms/rxvt/files/digest-rxvt-2.7.9
deleted file mode 100644
index 4697c1b65dce..000000000000
--- a/x11-terms/rxvt/files/digest-rxvt-2.7.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ccfeb67133c5f2997ffc2ac014962a5 rxvt-2.7.9.tar.gz 495170
diff --git a/x11-terms/rxvt/files/rxvt-2.7.9-azz4.diff b/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff
index c6b34dfce60f..4baf507685be 100644
--- a/x11-terms/rxvt/files/rxvt-2.7.9-azz4.diff
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff
@@ -1,6 +1,6 @@
-diff -Naur rxvt-2.7.8/AZZ-ChangeLog rxvt-2.7.8-azz4/AZZ-ChangeLog
---- rxvt-2.7.8/AZZ-ChangeLog	Thu Jan  1 01:00:00 1970
-+++ rxvt-2.7.8-azz4/AZZ-ChangeLog	Mon May 20 23:10:36 2002
+diff -Naurp rxvt-2.7.10.orig/AZZ-ChangeLog rxvt-2.7.10/AZZ-ChangeLog
+--- rxvt-2.7.10.orig/AZZ-ChangeLog	1969-12-31 19:00:00.000000000 -0500
++++ rxvt-2.7.10/AZZ-ChangeLog	2003-03-31 14:11:43.000000000 -0500
 @@ -0,0 +1,7 @@
 +- Modified to support borderlessness with -nb and override-redirect with
 +  -or (or resources borderless and overrideRedirect).
@@ -9,10 +9,10 @@ diff -Naur rxvt-2.7.8/AZZ-ChangeLog rxvt-2.7.8-azz4/AZZ-ChangeLog
 +- Fixed buffer overflow in command.c (not that you should install this suid
 +  root anyway)
 +
-diff -Naur rxvt-2.7.8/src/command.c rxvt-2.7.8-azz4/src/command.c
---- rxvt-2.7.8/src/command.c	Thu Nov 29 06:53:58 2001
-+++ rxvt-2.7.8-azz4/src/command.c	Mon May 20 23:11:21 2002
-@@ -2930,7 +2930,7 @@
+diff -Naurp rxvt-2.7.10.orig/src/command.c rxvt-2.7.10/src/command.c
+--- rxvt-2.7.10.orig/src/command.c	2003-03-26 01:01:23.000000000 -0500
++++ rxvt-2.7.10/src/command.c	2003-03-31 14:11:43.000000000 -0500
+@@ -3098,7 +3098,7 @@ rxvt_tt_printf(rxvt_t *r, const char *fm
      unsigned char   buf[256];
  
      va_start(arg_ptr, fmt);
@@ -21,9 +21,9 @@ diff -Naur rxvt-2.7.8/src/command.c rxvt-2.7.8-azz4/src/command.c
      va_end(arg_ptr);
      rxvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
  }
-diff -Naur rxvt-2.7.8/src/init.c rxvt-2.7.8-azz4/src/init.c
---- rxvt-2.7.8/src/init.c	Thu Nov 29 06:38:07 2001
-+++ rxvt-2.7.8-azz4/src/init.c	Mon May 20 23:22:45 2002
+diff -Naurp rxvt-2.7.10.orig/src/init.c rxvt-2.7.10/src/init.c
+--- rxvt-2.7.10.orig/src/init.c	2002-12-04 00:21:39.000000000 -0500
++++ rxvt-2.7.10/src/init.c	2003-03-31 14:11:43.000000000 -0500
 @@ -34,6 +34,7 @@
  #include "../config.h"		/* NECESSARY */
  #include "rxvt.h"		/* NECESSARY */
@@ -32,7 +32,7 @@ diff -Naur rxvt-2.7.8/src/init.c rxvt-2.7.8-azz4/src/init.c
  
  #include <signal.h>
  
-@@ -917,6 +918,24 @@
+@@ -1126,6 +1127,24 @@ rxvt_Create_Windows(rxvt_t *r, int argc,
  					       r->PixColors[Color_border],
  					       r->PixColors[Color_fg]);
  #endif
@@ -57,10 +57,10 @@ diff -Naur rxvt-2.7.8/src/init.c rxvt-2.7.8-azz4/src/init.c
      rxvt_xterm_seq(r, XTerm_title, r->h->rs[Rs_title], CHAR_ST);
      rxvt_xterm_seq(r, XTerm_iconName, r->h->rs[Rs_iconName], CHAR_ST);
  
-diff -Naur rxvt-2.7.8/src/rxvt.h rxvt-2.7.8-azz4/src/rxvt.h
---- rxvt-2.7.8/src/rxvt.h	Thu Nov 29 06:38:07 2001
-+++ rxvt-2.7.8-azz4/src/rxvt.h	Mon May 20 23:30:20 2002
-@@ -556,6 +556,9 @@
+diff -Naurp rxvt-2.7.10.orig/src/rxvt.h rxvt-2.7.10/src/rxvt.h
+--- rxvt-2.7.10.orig/src/rxvt.h	2003-03-06 20:17:18.000000000 -0500
++++ rxvt-2.7.10/src/rxvt.h	2003-03-31 14:11:43.000000000 -0500
+@@ -581,6 +581,9 @@ enum {
      Rs_modifier,
      Rs_answerbackstring,
      Rs_tripleclickwords,
@@ -70,21 +70,21 @@ diff -Naur rxvt-2.7.8/src/rxvt.h rxvt-2.7.8-azz4/src/rxvt.h
      NUM_RESOURCES
  } ;
  
-diff -Naur rxvt-2.7.8/src/rxvtlib.h.in rxvt-2.7.8-azz4/src/rxvtlib.h.in
---- rxvt-2.7.8/src/rxvtlib.h.in	Tue Nov 27 12:51:15 2001
-+++ rxvt-2.7.8-azz4/src/rxvtlib.h.in	Mon May 20 23:15:31 2002
-@@ -189,6 +189,8 @@
- #define Opt_tripleclickwords	(1LU<<16)
+diff -Naurp rxvt-2.7.10.orig/src/rxvtlib.h.in rxvt-2.7.10/src/rxvtlib.h.in
+--- rxvt-2.7.10.orig/src/rxvtlib.h.in	2003-02-27 20:03:16.000000000 -0500
++++ rxvt-2.7.10/src/rxvtlib.h.in	2003-03-31 14:12:59.000000000 -0500
+@@ -218,6 +218,8 @@ typedef enum {
  #define Opt_scrollWithBuffer	(1LU<<17)
  #define Opt_jumpScroll		(1LU<<18)
-+#define Opt_borderless          (1LU<<19)
-+#define Opt_overrideredirect    (1LU<<20)
+ #define Opt_mouseWheelScrollPage (1LU<<19)
++#define Opt_borderless		(1LU<<20)
++#define Opt_overrideredirect	(1LU<<21)
  /* place holder used for parsing command-line options */
  #define Opt_Reverse		(1LU<<30)
  #define Opt_Boolean		(1LU<<31)
-diff -Naur rxvt-2.7.8/src/screen.c rxvt-2.7.8-azz4/src/screen.c
---- rxvt-2.7.8/src/screen.c	Wed Nov 28 11:58:12 2001
-+++ rxvt-2.7.8-azz4/src/screen.c	Mon May 20 23:28:19 2002
+diff -Naurp rxvt-2.7.10.orig/src/screen.c rxvt-2.7.10/src/screen.c
+--- rxvt-2.7.10.orig/src/screen.c	2003-03-23 11:56:06.000000000 -0500
++++ rxvt-2.7.10/src/screen.c	2003-03-31 14:11:43.000000000 -0500
 @@ -29,6 +29,7 @@
  #include "screen.intpro"	/* PROTOS for internal routines */
  
@@ -93,7 +93,7 @@ diff -Naur rxvt-2.7.8/src/screen.c rxvt-2.7.8-azz4/src/screen.c
  
  /* ------------------------------------------------------------------------- */
  #ifdef MULTICHAR_SET
-@@ -1829,6 +1830,9 @@
+@@ -1832,6 +1833,9 @@ rxvt_scr_changeview(rxvt_t *r, u_int16_t
  void
  rxvt_scr_bell(rxvt_t *r)
  {
@@ -103,7 +103,7 @@ diff -Naur rxvt-2.7.8/src/screen.c rxvt-2.7.8-azz4/src/screen.c
  #ifndef NO_BELL
  # ifndef NO_MAPALERT
  #  ifdef MAPALERT_OPTION
-@@ -1842,6 +1846,7 @@
+@@ -1845,6 +1849,7 @@ rxvt_scr_bell(rxvt_t *r)
      } else
  	XBell(r->Xdisplay, 0);
  #endif
@@ -111,10 +111,10 @@ diff -Naur rxvt-2.7.8/src/screen.c rxvt-2.7.8-azz4/src/screen.c
  }
  
  /* ------------------------------------------------------------------------- */
-diff -Naur rxvt-2.7.8/src/xdefaults.c rxvt-2.7.8-azz4/src/xdefaults.c
---- rxvt-2.7.8/src/xdefaults.c	Thu Nov 29 07:22:51 2001
-+++ rxvt-2.7.8-azz4/src/xdefaults.c	Mon May 20 23:29:42 2002
-@@ -108,6 +108,9 @@
+diff -Naurp rxvt-2.7.10.orig/src/xdefaults.c rxvt-2.7.10/src/xdefaults.c
+--- rxvt-2.7.10.orig/src/xdefaults.c	2003-02-27 20:03:18.000000000 -0500
++++ rxvt-2.7.10/src/xdefaults.c	2003-03-31 14:11:43.000000000 -0500
+@@ -108,6 +108,9 @@ static const struct {
  	 "scroll-on-tty-output inhibit"),
      BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
  	 "scroll-on-keypress"),
diff --git a/x11-terms/rxvt/rxvt-2.7.9.ebuild b/x11-terms/rxvt/rxvt-2.7.10.ebuild
index 32590289442b..0cfd8a14def7 100644
--- a/x11-terms/rxvt/rxvt-2.7.9.ebuild
+++ b/x11-terms/rxvt/rxvt-2.7.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.9.ebuild,v 1.2 2003/03/07 08:09:31 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10.ebuild,v 1.1 2003/03/31 19:47:25 dragon Exp $
 
 inherit eutils
 
@@ -10,10 +10,7 @@ DESCRIPTION="rxvt -- nice small x11 terminal"
 SRC_URI="ftp://ftp.rxvt.org/pub/rxvt/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-#This ebuild has problems compiling, and die doesn't detect the error.
-#some UTMP issue, and rxvt doesn't compile. So zapping this for now (drobbins, 07 Mar 2003)
-KEYWORDS="-*"
-#KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips"
 
 HOMEPAGE="http://www.rxvt.org"
 
@@ -30,11 +27,11 @@ src_unpack() {
 }
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
+	econf \
+		--enable-everything \
 		--enable-rxvt-scroll \
+		--enable-next-scroll \
+		--enable-xterm-scroll \
 		--enable-transparency \
 		--enable-xpm-background \
 		--enable-utmp \
@@ -42,6 +39,7 @@ src_compile() {
 		--enable-mousewheel \
 		--enable-slipwheeling \
 		--enable-smart-resize \
+		--enable-256-color \
 		--enable-menubar \
 		--enable-languages \
 		--enable-xim \
@@ -53,10 +51,8 @@ src_compile() {
 
 src_install() {
 
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man/man1 \
-	install || die
+	einstall \
+		mandir=${D}/usr/share/man/man1 || die
 	
 	cd ${S}/doc
 	dodoc README* *.txt BUGS FAQ