From 3a5a512d2156224c3e4375610673eef3ef545c82 Mon Sep 17 00:00:00 2001
From: kim <kim>
Date: Sun, 15 Sep 2002 19:16:44 +0000
Subject: Add utmpx support from the tcsh CVS repo (by christos).

---
 shells/tcsh/Makefile         |  5 ++---
 shells/tcsh/distinfo         |  4 +++-
 shells/tcsh/patches/patch-am | 13 +++++++++++++
 shells/tcsh/patches/patch-an | 18 ++++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 shells/tcsh/patches/patch-am
 create mode 100644 shells/tcsh/patches/patch-an

(limited to 'shells')

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 2c35224209d..c3432e818b2 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2002/08/11 05:11:17 kim Exp $
+# $NetBSD: Makefile,v 1.38 2002/09/15 19:16:44 kim Exp $
 #
 
 DISTNAME=	tcsh-6.12.00
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.gw.com/pub/unix/tcsh/ \
@@ -11,8 +12,6 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.tcsh.org/
 COMMENT=	Extended C-shell with many useful features
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all catalogs
 INSTALL_TARGET=	install install.man
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 1323748b3a8..2b93d2dd4f9 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2002/08/11 05:11:17 kim Exp $
+$NetBSD: distinfo,v 1.11 2002/09/15 19:16:44 kim Exp $
 
 SHA1 (tcsh-6.12.00.tar.gz) = c54fd7a6823a4d30a4195f0fb9f31c6e2ddbd8e5
 Size (tcsh-6.12.00.tar.gz) = 824297 bytes
 SHA1 (patch-aa) = 51b96fff19fcfb55e6c841460c7a771c4678978f
 SHA1 (patch-ad) = 8cc4426557057c347525f384d862f6820e165fe7
 SHA1 (patch-al) = abb131d38e0dc0e4970f3aaa0a026783949cd574
+SHA1 (patch-am) = f605aa65d75732c3950b8ba6c51eb5dfcc16d717
+SHA1 (patch-an) = faf86b1e81693d14cd9bd33839fa50bb91662ed6
diff --git a/shells/tcsh/patches/patch-am b/shells/tcsh/patches/patch-am
new file mode 100644
index 00000000000..01ddde3d79e
--- /dev/null
+++ b/shells/tcsh/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/09/15 19:16:45 kim Exp $
+
+--- tc.who.c.orig	Mon Jul  1 17:12:04 2002
++++ tc.who.c	Sun Sep 15 15:05:29 2002
+@@ -52,6 +52,8 @@
+ # ifndef _PATH_UTMP
+ #  if defined(__UTMPX_FILE) && !defined(UTMPX_FILE)
+ #   define _PATH_UTMP __UTMPX_FILE
++#  elif defined(_PATH_UTMPX)
++#   define _PATH_UTMP _PATH_UTMPX
+ #  else
+ #   define _PATH_UTMP UTMPX_FILE
+ #  endif /* __UTMPX_FILE && !UTMPX_FILE */
diff --git a/shells/tcsh/patches/patch-an b/shells/tcsh/patches/patch-an
new file mode 100644
index 00000000000..3918a615198
--- /dev/null
+++ b/shells/tcsh/patches/patch-an
@@ -0,0 +1,18 @@
+$NetBSD: patch-an,v 1.1 2002/09/15 19:16:46 kim Exp $
+
+--- config/bsd4.4.orig	Tue Feb 12 17:36:50 2002
++++ config/bsd4.4	Sun Sep 15 15:06:13 2002
+@@ -125,6 +125,13 @@
+ #define BSD_STYLE_COLORLS
+ #endif
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Version__  >= 106030000       /* NetBSD 1.6C */
++#define HAVEUTMPX
++#endif
++#endif
++
+ #if defined(__bsdi__)
+ /*
+  * _PATH_TCSHELL      if you've change the installation location (vix)
-- 
cgit v1.2.3