diff options
| author | bouyer <bouyer@pkgsrc.org> | 2002-10-26 18:02:16 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2002-10-26 18:02:16 +0000 |
| commit | 1ebd9a3c58c2ad03707b66cacdf42bdff47403f6 (patch) | |
| tree | b2f184d4fa1de51f2426a3d8f1dcc92970e37f07 /x11 | |
| parent | e0dc53079dad3010e4e1bc4e048d5a49d2dfbafb (diff) | |
| download | pkgsrc-1ebd9a3c58c2ad03707b66cacdf42bdff47403f6.tar.gz | |
termios and UTMP fixes for Solaris.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/rxvt/Makefile | 17 | ||||
| -rw-r--r-- | x11/rxvt/distinfo | 5 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-af | 4 | ||||
| -rw-r--r-- | x11/rxvt/patches/patch-ag | 15 |
4 files changed, 32 insertions, 9 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 29c79624715..18fe2122455 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2002/08/25 21:52:45 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2002/10/26 18:02:16 bouyer Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -18,8 +18,6 @@ USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-utmp \ - --enable-wtmp \ - --enable-lastlog \ --enable-xpm-background \ --enable-transparency \ --enable-menubar \ @@ -30,8 +28,7 @@ CONFIGURE_ARGS+= --enable-utmp \ --enable-frills \ --enable-keepscrolling \ --enable-mousewheel \ - --enable-languages \ - --with-encoding=noenc + --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 @@ -52,5 +49,15 @@ pre-install: ${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11PREFIX}/lib/X11/app-defaults; \ fi +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +CFLAGS+= -DSunOS +.else +CONFIGURE_ARGS+= --enable-wtmp \ + --enable-lastlog \ + --with-encoding=noenc +.endif + .include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo index 2260a0a43d9..c6aa4c48cbb 100644 --- a/x11/rxvt/distinfo +++ b/x11/rxvt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/09/30 21:20:06 martin Exp $ +$NetBSD: distinfo,v 1.7 2002/10/26 18:02:16 bouyer Exp $ SHA1 (rxvt-2.7.3.tar.bz2) = 1f5380ba70d1b795e6532a79b1e2d7371505b504 Size (rxvt-2.7.3.tar.bz2) = 266784 bytes @@ -7,4 +7,5 @@ SHA1 (patch-ab) = 72d2fac47a414e1d64aedc4ad20670736e24b0fa SHA1 (patch-ac) = fda884add4b43b606cb348e47b48eb6ffeafffec SHA1 (patch-ad) = 86047c69fa397d71f3e71ae476bd7addd153729f SHA1 (patch-ae) = ce0bd392cde7c436834f68391e0d38b53f1755cc -SHA1 (patch-af) = 26712a68e41d8fc71a56d90f364793c367494d2a +SHA1 (patch-af) = 4974d45d51e1d8a5b5ee86e690c8dd0ca1c8ed35 +SHA1 (patch-ag) = 132922885b899dff22a964b1bb491ac25b6e17b8 diff --git a/x11/rxvt/patches/patch-af b/x11/rxvt/patches/patch-af index 48522ec7761..ebb874125ac 100644 --- a/x11/rxvt/patches/patch-af +++ b/x11/rxvt/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.4 2002/09/30 21:20:06 martin Exp $ +$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 @@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.4 2002/09/30 21:20:06 martin Exp $ void rxvt_update_lastlog(const char *fname, const char *pty, const char *host) { -+# ifdef RXVT_UTMP_AS_UTMPX ++# if defined(RXVT_UTMP_AS_UTMPX) && !defined(SunOS) + struct lastlogx ll; + char filename[FILENAME_MAX]; + diff --git a/x11/rxvt/patches/patch-ag b/x11/rxvt/patches/patch-ag new file mode 100644 index 00000000000..035bd2e2db1 --- /dev/null +++ b/x11/rxvt/patches/patch-ag @@ -0,0 +1,15 @@ +$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 */ |