Update to V2.6.0. Too many changes to list, see ChangeLog.

6 files changed, 54 insertions, 89 deletions

diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 05725a02913..ec7d800bebd 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,16 +1,36 @@
-# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:49 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/06/14 01:28:13 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
-DISTNAME=		rxvt-2.20
+DISTNAME=		rxvt-2.6.0
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SUNSITE:=utils/file/managers/mc/rxvt/} \
+MASTER_SITES=		ftp://ftp.rxvt.org/pub/rxvt/ \
+			${MASTER_SITE_SUNSITE:=utils/file/managers/mc/rxvt/} \
 			ftp://ftp.nuclecu.unam.mx/linux/local/rxvt/  \
 			ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.rxvt.org/
+
+DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-utmp \
+			--enable-wtmp \
+			--enable-xpm-background \
+			--enable-transparency \
+			--enable-menubar \
+			--enable-xterm-scroll \
+			--enable-xim \
+			--enable-kanji \
+			--enable-big5 \
+			--enable-gb \
+			--enable-greek \
+			--enable-xgetdefault \
+			--disable-memset \
+			--with-xpm-includes=${X11BASE}/include/X11 \
+			--with-xpm-library=${X11BASE}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt/files/md5 b/x11/rxvt/files/md5
index eb9101fd322..004e9791bbe 100644
--- a/x11/rxvt/files/md5
+++ b/x11/rxvt/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:29:06 agc Exp $
+$NetBSD: md5,v 1.3 1999/06/14 01:28:14 hubertf Exp $
 
-MD5 (rxvt-2.20.tar.gz) = 860432f0d146d0cdf4630967f6c94ae3
+MD5 (rxvt-2.6.0.tar.bz2) = 8f6d86c2b76d7f2945d121191ef25158
diff --git a/x11/rxvt/patches/patch-ab b/x11/rxvt/patches/patch-ab
index 2651bf14350..d8c57bee542 100644
--- a/x11/rxvt/patches/patch-ab
+++ b/x11/rxvt/patches/patch-ab
@@ -1,21 +1,23 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:18:14 agc Exp $
+$NetBSD: patch-ab,v 1.3 1999/06/14 01:28:14 hubertf Exp $
 
---- ./src/utmp.c.org	Thu Jan 23 10:46:02 1997
-+++ ./src/utmp.c	Thu Apr 24 15:20:49 1997
-@@ -80,6 +80,8 @@
- #include <stdio.h>
- #include <string.h>
+--- doc/Makefile.in.orig	Mon Jun 14 03:07:48 1999
++++ doc/Makefile.in	Mon Jun 14 03:08:19 1999
+@@ -40,6 +40,9 @@
+ #-------------------------------------------------------------------------
  
-+#include <sys/types.h>
+ all:
++	# Nothing
 +
- #ifdef HAVE_UTMPX_H
- # include <utmpx.h>
- # define USE_SYSV_UTMP
-@@ -90,7 +92,6 @@
- # endif
- #endif
++oldall:
+ 	@if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
  
--#include <sys/types.h>
- #include <sys/stat.h>
+ SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
+@@ -86,7 +89,7 @@
  
- #ifdef TIME_WITH_SYS_TIME
+ distclean:
+ 
+-install: rxvt.1
++install: 
+ 	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
+ 
+ uninstall:
diff --git a/x11/rxvt/patches/patch-ad b/x11/rxvt/patches/patch-ad
deleted file mode 100644
index 26fcbd6bd0c..00000000000
--- a/x11/rxvt/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:18:14 agc Exp $
-
---- doc/Makefile.in.orig	Fri Sep 27 10:48:24 1996
-+++ doc/Makefile.in	Mon Feb 24 01:14:02 1997
-@@ -25,7 +25,7 @@
- 
- tags allbin:
- 
--alldoc:	rxvt.1 LSM
-+alldoc:	rxvt.1 # LSM
- 
- clean:
- 	$(RMF) LSM rxvt.1 *~
diff --git a/x11/rxvt/patches/patch-ae b/x11/rxvt/patches/patch-ae
deleted file mode 100644
index d3b9ce68d8f..00000000000
--- a/x11/rxvt/patches/patch-ae
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:18:14 agc Exp $
-
---- src/feature.h.orig	Thu Jan 23 10:46:02 1997
-+++ src/feature.h	Mon Feb 24 03:56:40 1997
-@@ -136,8 +136,8 @@
-  *	default rendition rather than the current rendition
-  *	NB: this make break some applications and should used with caution
-  *----------------------------------------------------------------------*/
--#define XPM_BACKGROUND
--#define XPM_SCALING
-+/* #define XPM_BACKGROUND */
-+/* #define XPM_SCALING */
- #define PATH_ENV	"RXVTPATH"
- /* #define XPM_BUFFERING */
- /* #define NO_CURSORCOLOR */
-@@ -272,8 +272,9 @@
-  *	for XTERM_SCROLLBAR it is *always* 14.
-  *----------------------------------------------------------------------*/
- /* #define XTERM_SCROLLBAR */
--#define SCROLLBAR_RIGHT
-+/* #define SCROLLBAR_RIGHT */
- /* #define SB_WIDTH 10 */
-+#define SB_WIDTH 8
- /*}}}*/
- 
- /*{{{ menuBar: */
-@@ -367,14 +368,15 @@
-  *	for BSD-type systems, to define where the tty table is located
-  *	if it isn't /etc/ttytab
-  *----------------------------------------------------------------------*/
--/* #define UTMP_SUPPORT */
-+#define UTMP_SUPPORT
- #ifdef UTMP_SUPPORT
- # ifndef UTMP_FILENAME
- /* #  define UTMP_FILENAME	"/var/adm/utmp" */
- /* #  define UTMP_FILENAME	"/var/adm/utmp" */
-+#  define UTMP_FILENAME	"/var/run/utmp"
- # endif
- # ifndef TTYTAB_FILENAME
--/* #  define TTYTAB_FILENAME "/etc/ttys" */
-+#  define TTYTAB_FILENAME "/etc/ttys"
- # endif
- #endif
- /*}}}*/
diff --git a/x11/rxvt/patches/patch-ah b/x11/rxvt/patches/patch-ah
index c36101bedac..d272919bd1e 100644
--- a/x11/rxvt/patches/patch-ah
+++ b/x11/rxvt/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:18:15 agc Exp $
+$NetBSD: patch-ah,v 1.3 1999/06/14 01:28:14 hubertf Exp $
 
---- src/command.c.orig	Fri Sep 27 10:48:22 1996
-+++ src/command.c	Mon Feb 24 01:25:51 1997
-@@ -509,7 +509,7 @@
-    ttydev = tty_name;
+--- src/command.c.orig	Thu Jun  3 15:17:09 1999
++++ src/command.c	Mon Jun 14 02:07:23 1999
+@@ -316,7 +316,7 @@
+ 	ttydev = tty_name;
  
- # define	PTYCHAR1	"pqrstuvwxyz"
--# define	PTYCHAR2	"0123456789abcdef"
-+# define	PTYCHAR2	"0123456789abcdefghijklmnopqrstuv"
-    for (c1 = PTYCHAR1; *c1; c1++)
-      {
- 	ptydev [len-2] = ttydev [len-2] = *c1;
+ # define PTYCHAR1	"pqrstuvwxyz"
+-# define PTYCHAR2	"0123456789abcdef"
++# define PTYCHAR2	"0123456789abcdefghijklmnopqrstuv"
+ 	for (c1 = PTYCHAR1; *c1; c1++) {
+ 	    ptydev[len] = ttydev[len] = *c1;
+ 	    for (c2 = PTYCHAR2; *c2; c2++) {