9 files changed, 109 insertions, 63 deletions

diff --git a/x11/rxvt-unicode/files/patch-aa b/x11/rxvt-unicode/files/patch-aa
deleted file mode 100644
index e90f485112ef..000000000000
--- a/x11/rxvt-unicode/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Aug 21 23:31:36 2000
-+++ Makefile.in	Mon Aug 21 23:31:51 2000
-@@ -9,7 +9,7 @@
- first_rule: all
- dummy:
- 
--subdirs = src doc rclock src/graphics
-+subdirs = src doc
- 
- DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
- 
diff --git a/x11/rxvt-unicode/files/patch-ab b/x11/rxvt-unicode/files/patch-ab
deleted file mode 100644
index a2c62c26ff94..000000000000
--- a/x11/rxvt-unicode/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/Makefile.in.orig	Mon Aug 21 23:32:21 2000
-+++ doc/Makefile.in	Mon Aug 21 23:32:44 2000
-@@ -41,9 +41,6 @@
- 
- all: rxvt.1
- 
--rxvt.1: Makefile
--	@if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
--
- SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
- 	     -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
- 	     -e 's%@RXVT_DATE@%$(DATE)%g;'\
diff --git a/x11/rxvt-unicode/files/patch-ac b/x11/rxvt-unicode/files/patch-ac
deleted file mode 100644
index 5e70c833507b..000000000000
--- a/x11/rxvt-unicode/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- autoconf/config.h.in.orig	Mon Aug 21 23:33:43 2000
-+++ autoconf/config.h.in	Mon Aug 21 23:34:39 2000
-@@ -161,7 +161,7 @@
- #undef HAVE_UTMP_HOST
- 
- /* Define location of utmp */
--#undef RXVT_UTMP_FILE
-+#define RXVT_UTMP_FILE "/var/run/utmp"
- 
- /* Define in utmpx.h has struct utmpx */
- #undef HAVE_STRUCT_UTMPX
-@@ -173,7 +173,7 @@
- #undef RXVT_UTMPX_FILE
- 
- /* Define location of wtmp */
--#undef RXVT_WTMP_FILE
-+#define RXVT_WTMP_FILE "/var/log/wtmp"
- 
- /* Define location of wtmpx */
- #undef RXVT_WTMPX_FILE
diff --git a/x11/rxvt-unicode/files/patch-ad b/x11/rxvt-unicode/files/patch-ad
deleted file mode 100644
index c057993b80dc..000000000000
--- a/x11/rxvt-unicode/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/command.c.orig	Thu Apr  5 03:52:39 2001
-+++ src/command.c	Fri Jun 22 13:36:57 2001
-@@ -322,7 +322,7 @@
- 	ttydev = tty_name;
- 
- # define PTYCHAR1	"pqrstuvwxyz"
--# define PTYCHAR2	"0123456789abcdef"
-+# define PTYCHAR2	"0123456789abcdefghijklmnopqrstuv"
- 	for (c1 = PTYCHAR1; *c1; c1++) {
- 	    ptydev[len] = ttydev[len] = *c1;
- 	    for (c2 = PTYCHAR2; *c2; c2++) {
-@@ -2376,7 +2376,7 @@
-     unsigned char   buf[256];
- 
-     va_start(arg_ptr, fmt);
--    vsprintf(buf, fmt, arg_ptr);
-+    vsnprintf(buf, sizeof(buf), fmt, arg_ptr);
-     va_end(arg_ptr);
-     tt_write(buf, strlen(buf));
- }
diff --git a/x11/rxvt-unicode/files/patch-src::Makefile.in b/x11/rxvt-unicode/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..a0973a231a18
--- /dev/null
+++ b/x11/rxvt-unicode/files/patch-src::Makefile.in
@@ -0,0 +1,40 @@
+--- src/Makefile.in.orig	Mon Aug 16 01:11:45 2004
++++ src/Makefile.in	Tue Aug 17 21:25:56 2004
+@@ -72,13 +72,13 @@
+ 	$(COMPILE) -c $<
+ 
+ .C.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++	$(LIBTOOL) --tag=CXX --mode=compile $(COMPILE) -c $<
+ 
+ .s.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++	$(LIBTOOL) --tag=CXX --mode=compile $(COMPILE) -c $<
+ 
+ .S.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++	$(LIBTOOL) --tag=CXX --mode=compile $(COMPILE) -c $<
+ 
+ .C.intpro:
+ 	@$(RMF) $@.tmp
+@@ -91,16 +91,16 @@
+ all: allbin
+ 
+ rxvt: version.h rxvt.o librxvt.la
+-	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
++	$(LIBTOOL) --tag=CXX --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
+ 
+ rxvtd: version.h rxvtd.o librxvt.la rxvtdaemon.o
+-	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
++	$(LIBTOOL) --tag=CXX --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
+ 
+ rxvtc: version.h rxvtc.o rxvtdaemon.o
+-	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@
++	$(LIBTOOL) --tag=CXX --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@
+ 
+ librxvt.la: $(LIBOBJS)
+-	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
++	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
+ 
+ #-------------------------------------------------------------------------
+ 
diff --git a/x11/rxvt-unicode/files/patch-src::command.C b/x11/rxvt-unicode/files/patch-src::command.C
new file mode 100644
index 000000000000..98008058103b
--- /dev/null
+++ b/x11/rxvt-unicode/files/patch-src::command.C
@@ -0,0 +1,29 @@
+--- src/command.C.orig	Mon Aug 16 09:13:25 2004
++++ src/command.C	Tue Aug 17 23:49:02 2004
+@@ -51,6 +51,8 @@
+ #include "command.h"
+ 
+ #include <wchar.h>
++#include <sys/types.h>
++#include <signal.h>
+ 
+ /*----------------------------------------------------------------------*/
+ 
+@@ -4250,7 +4252,7 @@
+     {
+       if (v_buflen == 0)
+         {
+-          ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
++          ssize_t written = write (pty.pty, data, min (len, (unsigned int) MAX_PTY_WRITE));
+ 
+           if ((unsigned int)written == len)
+             return;
+@@ -4268,7 +4270,7 @@
+ 
+   for (;;)
+     {
+-      int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
++      int written = write (pty.pty, v_buffer, min ((unsigned int) MAX_PTY_WRITE, v_buflen));
+ 
+       if (written > 0)
+         {
diff --git a/x11/rxvt-unicode/files/patch-src::gentables b/x11/rxvt-unicode/files/patch-src::gentables
new file mode 100644
index 000000000000..8e3d82b5d7dd
--- /dev/null
+++ b/x11/rxvt-unicode/files/patch-src::gentables
@@ -0,0 +1,8 @@
+--- ./src/gentables.orig	Wed Aug  4 04:59:09 2004
++++ ./src/gentables	Tue Aug 10 00:03:21 2004
+@@ -1,4 +1,4 @@
+-#!/opt/bin/perl
++#!/usr/bin/perl
+ 
+ # the generated tables mostly have NOT been checked so far!
+ 
diff --git a/x11/rxvt-unicode/files/patch-src::ptytty.C b/x11/rxvt-unicode/files/patch-src::ptytty.C
new file mode 100644
index 000000000000..20d723c4434d
--- /dev/null
+++ b/x11/rxvt-unicode/files/patch-src::ptytty.C
@@ -0,0 +1,14 @@
+--- src/ptytty.C.orig	Sat Jul 31 17:05:04 2004
++++ src/ptytty.C	Tue Aug 10 18:16:01 2004
+@@ -33,6 +33,11 @@
+ #endif
+ #endif
+ 
++#if defined( __FreeBSD__)
++#include <sys/types.h>
++# include <libutil.h>
++#endif
++
+ #include <cstdio>
+ #ifdef HAVE_STDLIB_H
+ # include <cstdlib>
diff --git a/x11/rxvt-unicode/files/patch-src::rxvtutil.C b/x11/rxvt-unicode/files/patch-src::rxvtutil.C
new file mode 100644
index 000000000000..8a20f4b0a495
--- /dev/null
+++ b/x11/rxvt-unicode/files/patch-src::rxvtutil.C
@@ -0,0 +1,18 @@
+--- ./src/rxvtutil.C.orig	Mon Aug 16 01:11:46 2004
++++ ./src/rxvtutil.C	Tue Aug 17 23:15:04 2004
+@@ -4,6 +4,7 @@
+ 
+ #include "rxvtutil.h"
+ 
++#ifdef HAVE_SYS_BYTEORDER_H
+ class byteorder byteorder;
+ 
+ byteorder::byteorder ()
+@@ -20,6 +21,6 @@
+ 
+   e = w.u;
+ }
+-
++#endif
+ 
+