diff options
| -rw-r--r-- | x11/rxvt/DESCR | 10 | ||||
| -rw-r--r-- | x11/rxvt/MESSAGE | 8 | ||||
| -rw-r--r-- | x11/rxvt/Makefile | 34 | ||||
| -rw-r--r-- | x11/rxvt/distinfo | 14 | ||||
| -rw-r--r-- | x11/rxvt/files/Rxvt | 25 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-aa | 10 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-ac | 30 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-ae | 13 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-af | 31 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-ag | 15 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-ah | 19 |
11 files changed, 41 insertions, 168 deletions
diff --git a/x11/rxvt/DESCR b/x11/rxvt/DESCR index ebf227ea910..cba042f5508 100644 --- a/x11/rxvt/DESCR +++ b/x11/rxvt/DESCR @@ -1,6 +1,6 @@ -Rxvt is an xterm replacement which uses a little less memory, and is -suitable for use on machines with small memories. Tek4010 support -is removed. +Rxvt is an xterm replacement which uses a little less memory, and is +suitable for use on machines with small memories. Tek4010 support is +not provided. -Modifications were made by Rob Nation (nation@rocket.sanders.lockheed.com) -to make it a little more compact, and to add and remove certain features. +Modifications were made by Rob Nation and several others to make it +a little more compact, and to add and remove certain features. diff --git a/x11/rxvt/MESSAGE b/x11/rxvt/MESSAGE index c835dd2417f..f4ff70ecc41 100644 --- a/x11/rxvt/MESSAGE +++ b/x11/rxvt/MESSAGE @@ -1,11 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:54 wiz Exp $ - -The rxvt binary is able to use greek keyboard extensions and -multibyte character encodings. Due to errors in the current -version, the greek keyboard support is not compiled into the -binary (it can not be disabled at runtime and causes problems -for users in other locales). +$NetBSD: MESSAGE,v 1.4 2003/03/27 07:14:25 wiz Exp $ The multibyte character encoding support is compiled in, but by default disabled. To enable it, please edit the file diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 8d15179a2b8..28fec725e08 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.34 2003/01/14 09:08:02 grant Exp $ +# $NetBSD: Makefile,v 1.35 2003/03/27 07:14:25 wiz Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # -DISTNAME= rxvt-2.7.3 +DISTNAME= rxvt-2.7.10 CATEGORIES= x11 MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \ - ftp://ftp.rxvt.org/pub/rxvt/devel/ \ - ftp://ftp.rxvt.org/pub/rxvt/old/ \ ftp://mason.primenet.com.au/pub/rxvt/ EXTRACT_SUFX= .tar.bz2 @@ -19,23 +17,26 @@ USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-utmp \ + --enable-wtmp \ + --enable-lastlog \ --enable-xpm-background \ --enable-transparency \ --enable-menubar \ + --enable-rxvt-scroll \ + --enable-next-scroll \ --enable-xterm-scroll \ --enable-xim \ + --enable-greek \ --enable-ttygid \ --enable-xgetdefault \ --enable-frills \ + --enable-linespace \ + --enable-24bit \ --enable-keepscrolling \ --enable-mousewheel \ - --enable-languages - -# Note: greek support could not be enabled, as the resource file handling -# to disable it at runtime is documented but not implemented in the current -# version. See files/Rxvt and check if it works for newer versions. When -# enabling it, please fix MESSAGE as well. -# --enable-greek + --enable-slipwheeling \ + --enable-languages \ + --with-encoding=noenc CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include/X11 CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib @@ -52,12 +53,17 @@ pre-install: .include "../../mk/bsd.prefs.mk" +post-install: +.if ${OPSYS} == "NetBSD" + # Make rxvt setuid root so that utmp logging functions correctly. + # + ${CHOWN} 0 ${PREFIX}/bin/rxvt + ${CHMOD} 4711 ${PREFIX}/bin/rxvt +.endif + .if ${OPSYS} == "SunOS" CFLAGS+= -DSunOS .else -CONFIGURE_ARGS+= --enable-wtmp \ - --enable-lastlog \ - --with-encoding=noenc .endif .include "../../graphics/xpm/buildlink2.mk" diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo index 383380c55e7..a57f15c26dc 100644 --- a/x11/rxvt/distinfo +++ b/x11/rxvt/distinfo @@ -1,11 +1,7 @@ -$NetBSD: distinfo,v 1.10 2003/01/10 16:16:08 wiz Exp $ +$NetBSD: distinfo,v 1.11 2003/03/27 07:14:25 wiz Exp $ -SHA1 (rxvt-2.7.3.tar.bz2) = 1f5380ba70d1b795e6532a79b1e2d7371505b504 -Size (rxvt-2.7.3.tar.bz2) = 266784 bytes -SHA1 (patch-aa) = 64b7a9793af452fc330715e1f06cc6507f1eda61 -SHA1 (patch-ac) = fda884add4b43b606cb348e47b48eb6ffeafffec +SHA1 (rxvt-2.7.10.tar.bz2) = 16eae23c3227e28e5e7a53a58eaa3226affe65f9 +Size (rxvt-2.7.10.tar.bz2) = 493199 bytes +SHA1 (patch-aa) = 7569bd4c4136d19ee4d8a6f1baa02b2b214ea4ad +SHA1 (patch-ab) = 62ef5b28f8842b769829fed0d217a9c54f48c832 SHA1 (patch-ad) = 86047c69fa397d71f3e71ae476bd7addd153729f -SHA1 (patch-ae) = ce0bd392cde7c436834f68391e0d38b53f1755cc -SHA1 (patch-af) = 4974d45d51e1d8a5b5ee86e690c8dd0ca1c8ed35 -SHA1 (patch-ag) = 132922885b899dff22a964b1bb491ac25b6e17b8 -SHA1 (patch-ah) = 909dbe0b6dcc0a2fde44f1b174f9af07e78d480e diff --git a/x11/rxvt/files/Rxvt b/x11/rxvt/files/Rxvt index f80acd9f213..b7c52297f6b 100644 --- a/x11/rxvt/files/Rxvt +++ b/x11/rxvt/files/Rxvt @@ -1,25 +1,10 @@ -! $NetBSD: Rxvt,v 1.1 2001/08/06 06:09:56 martin Exp $ +! $NetBSD: Rxvt,v 1.2 2003/03/27 07:14:26 wiz Exp $ ! -! This is a default Rxvt app defaults file that just disables greek keyboard -! support and multibyte character encodings. We build rxvt with support -! for these, but since the current rxvt version does not properly switch -! these features on or off at runtime, we controll them via resources. +! This is a default Rxvt app defaults file that just disables +! default multibyte character encodings. ! -! To enable one of these features, just comment the current active one -! and uncomment the one you prefere. - -! ---- NOTE ------------------- -! Greek keyboard support is not compiled into rxvt, as the following -! resource is documented but not implemented in the current version. -! ---- NOTE ------------------- -! greek keyboard support: -! default: -! Rxvt.greek_keyboard: iso -! Disable greek keyboard support (by disabling the toggle key): -! Rxvt.greektoggle_key: VoidSymbol -! Enable default greek keyboard support: use ModeSwitch to switch -! into greek input mode: -! Rxvt.greektoggle_key: ModeSwitch +! To enable this feature, just comment the current active one +! and uncomment the one you prefer. ! Select multibyte character sheme Rxvt.multichar_encoding: noenc diff --git a/x11/rxvt/patches/patch-aa b/x11/rxvt/patches/patch-aa index 5eeaf03851a..6b9b22d667c 100644 --- a/x11/rxvt/patches/patch-aa +++ b/x11/rxvt/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.7 2003/01/10 16:16:09 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2003/03/27 07:14:26 wiz Exp $ ---- Makefile.in.orig Tue Dec 21 21:07:54 1999 -+++ Makefile.in -@@ -9,7 +9,7 @@ VPATH = @srcdir@ +--- Makefile.in.org 2003-03-27 11:56:57.000000000 +1100 ++++ Makefile.in 2003-03-27 11:57:38.000000000 +1100 +@@ -9,7 +9,7 @@ first_rule: all dummy: -subdirs = src doc rclock src/graphics src/test +subdirs = src doc + allsubdirs = W11 $(subdirs) DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog - diff --git a/x11/rxvt/patches/patch-ac b/x11/rxvt/patches/patch-ac deleted file mode 100644 index fe897069ec1..00000000000 --- a/x11/rxvt/patches/patch-ac +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2002/09/30 21:20:06 martin Exp $ - ---- configure.orig Sun Mar 26 09:47:39 2000 -+++ configure Mon Sep 30 22:27:36 2002 -@@ -4163,6 +4163,7 @@ - cat > conftest.$ac_ext <<EOF - #line 4165 "configure" - #include "confdefs.h" -+#include <sys/types.h> - #include <stdio.h> - #include <utmp.h> - #include <errno.h> -@@ -4337,7 +4338,7 @@ - #ifdef UTMPX_FILE - UTMPX_FILE, - #endif -- "/var/adm/utmpx", "/etc/utmpx", NULL }; -+ "/var/run/utmpx", "/var/adm/utmpx", "/etc/utmpx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - struct stat statu, statux; - if (!f) exit(1); -@@ -5047,7 +5048,7 @@ - EOF - - fi --if test x$support_mousewheel = xyes; then -+if test x$support_mousewheel = xno; then - cat >> confdefs.h <<\EOF - #define NO_MOUSE_WHEEL 1 - EOF diff --git a/x11/rxvt/patches/patch-ae b/x11/rxvt/patches/patch-ae deleted file mode 100644 index 916ed68ba17..00000000000 --- a/x11/rxvt/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2000/09/20 02:12:12 hubertf Exp $ - ---- src/command.c.orig Wed Sep 20 03:59:35 2000 -+++ src/command.c -@@ -1395,6 +1395,8 @@ - am_transparent = 0; - /* XXX: also turn off Opt_transparent? */ - } else { -+ if (i > 1) -+ sleep(1); - D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); - for (n = 0; n < i; n++) - XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], diff --git a/x11/rxvt/patches/patch-af b/x11/rxvt/patches/patch-af deleted file mode 100644 index ebb874125ac..00000000000 --- a/x11/rxvt/patches/patch-af +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-af,v 1.5 2002/10/26 18:02:17 bouyer Exp $ - ---- src/logging.c.orig Mon Sep 30 22:44:27 2002 -+++ src/logging.c Mon Sep 30 23:00:46 2002 -@@ -130,6 +130,17 @@ - void - rxvt_update_lastlog(const char *fname, const char *pty, const char *host) - { -+# if defined(RXVT_UTMP_AS_UTMPX) && !defined(SunOS) -+ struct lastlogx ll; -+ char filename[FILENAME_MAX]; -+ -+ MEMSET(&ll, 0, sizeof(ll)); -+ gettimeofday(&ll.ll_tv, NULL); -+ STRNCPY(ll.ll_line, pty, sizeof(ll.ll_line)); -+ STRNCPY(ll.ll_host, host, sizeof(ll.ll_host)); -+ -+ updlastlogx(RXVT_UTMPX_FILE, geteuid(), &ll); -+# else - # ifdef HAVE_STRUCT_LASTLOG - int fd; - struct passwd *pwent; -@@ -165,6 +176,7 @@ - } - # endif /* LASTLOG_IS_DIR */ - # endif /* HAVE_STRUCT_LASTLOG */ -+# endif /* RXVT_UTMP_AS_UTMPX */ - } - #endif /* LASTLOG_SUPPORT */ - /* ------------------------------------------------------------------------- */ - diff --git a/x11/rxvt/patches/patch-ag b/x11/rxvt/patches/patch-ag deleted file mode 100644 index 035bd2e2db1..00000000000 --- a/x11/rxvt/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2002/10/26 18:02:17 bouyer Exp $ - ---- src/main.c.orig Sun Oct 20 23:05:32 2002 -+++ src/main.c Sun Oct 20 23:06:07 2002 -@@ -39,6 +39,10 @@ - # include <grp.h> - #endif - -+#ifdef SunOS -+# include <termios.h> -+#endif -+ - /*----------------------------------------------------------------------*/ - /* main() */ - /* INTPROTO */ diff --git a/x11/rxvt/patches/patch-ah b/x11/rxvt/patches/patch-ah deleted file mode 100644 index da7d2119f41..00000000000 --- a/x11/rxvt/patches/patch-ah +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ah,v 1.5 2002/12/18 15:31:22 christos Exp $ - ---- src/init.c.orig Sun Mar 26 02:47:01 2000 -+++ src/init.c Wed Dec 18 10:29:05 2002 -@@ -895,9 +895,13 @@ - /* - * Close all unused file descriptors. - * We don't want them, we don't need them. -+ * We keep stdout/stderr, and we will re-open stdin, because -+ * we want 0,1,2 open so that when pututxline() calls utmp_update -+ * which is set{u,g}id() the kernel does not complain. - */ - for (i = 0; i < num_fds; i++) { -- if (i == STDERR_FILENO || i == cfd || i == tty_fd || i == Xfd) -+ if (i == STDOUT_FILENO || i == STDERR_FILENO -+ || i == cfd || i == tty_fd || i == Xfd) - continue; - close(i); - } |