[pkgsrc/trunk]: pkgsrc/net Use getlogin() instead of cuserid() on NetBSD.

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53600d5de6d5
branches:  trunk
changeset: 469446:53600d5de6d5
user:      ben <ben%pkgsrc.org@localhost>
date:      Mon Feb 23 14:41:42 2004 +0000

description:
Use getlogin() instead of cuserid() on NetBSD.

diffstat:

 net/llnlxdir/distinfo         |   3 ++-
 net/llnlxdir/patches/patch-ab |  13 +++++++++++++
 net/llnlxftp/distinfo         |   3 ++-
 net/llnlxftp/patches/patch-ab |  22 ++++++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diffs (65 lines):

diff -r 50acb9f875e2 -r 53600d5de6d5 net/llnlxdir/distinfo
--- a/net/llnlxdir/distinfo     Mon Feb 23 14:09:01 2004 +0000
+++ b/net/llnlxdir/distinfo     Mon Feb 23 14:41:42 2004 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/12 05:43:42 ben Exp $
+$NetBSD: distinfo,v 1.2 2004/02/23 14:45:57 ben Exp $
 
 SHA1 (llnlxdir2_1_2.tar.Z) = b9e8f79929e693d4f0fd3b41f7ce3ceb76abd252
 Size (llnlxdir2_1_2.tar.Z) = 574027 bytes
 SHA1 (patch-aa) = 54ebaf3b006d6f1253b6baaad984addd698e9728
+SHA1 (patch-ab) = 734e8b92bc3c1efeb71138acf60eab04bd8639a6
diff -r 50acb9f875e2 -r 53600d5de6d5 net/llnlxdir/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/llnlxdir/patches/patch-ab     Mon Feb 23 14:41:42 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/02/23 14:45:57 ben Exp $
+
+--- lconnect.c.orig    1999-11-22 16:07:32.000000000 -0800
++++ lconnect.c
+@@ -92,7 +92,7 @@ init_local_host()
+       hinfo[LOCAL].hostname = local_host_name();
+ 
+       /* Get user name */
+-#if defined(__sony_news) || defined(__MACHTEN__)
++#if defined(__sony_news) || defined(__MACHTEN__) || defined(__NetBSD__)
+       if((username = getenv("USER")) || (username = getlogin()))
+ #else
+       if((username = getenv("USER")) || (username = cuserid(NULL)))
diff -r 50acb9f875e2 -r 53600d5de6d5 net/llnlxftp/distinfo
--- a/net/llnlxftp/distinfo     Mon Feb 23 14:09:01 2004 +0000
+++ b/net/llnlxftp/distinfo     Mon Feb 23 14:41:42 2004 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/12 05:48:30 ben Exp $
+$NetBSD: distinfo,v 1.2 2004/02/23 14:41:42 ben Exp $
 
 SHA1 (llnlxftp2.1.tar.Z) = bd7a2b1e9a53ae139559f09bfa5c4b590fa0cd5e
 Size (llnlxftp2.1.tar.Z) = 359401 bytes
 SHA1 (patch-aa) = d4cc87e2dce654d9b21d112cea5befb1ed070ac0
+SHA1 (patch-ab) = f43adf13f0cd6f16eb9df0756d033ff5586227f6
diff -r 50acb9f875e2 -r 53600d5de6d5 net/llnlxftp/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/llnlxftp/patches/patch-ab     Mon Feb 23 14:41:42 2004 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2004/02/23 14:41:42 ben Exp $
+
+--- lconnect.c.orig    1995-10-19 08:20:22.000000000 -0700
++++ lconnect.c
+@@ -53,7 +53,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if defined(SYSV) || defined(SYSV386) || defined(SVR4)
++#if defined(SYSV) || defined(SYSV386) || defined(SVR4) || defined(__NetBSD__)
+ #include <unistd.h>
+ #endif
+ #include <Xm/Xm.h>
+@@ -95,7 +95,7 @@ int host;
+       hinfo[host].hostname = local_host_name();
+ 
+       /* Get user name */
+-#ifdef __sony_news
++#if defined(__sony_news) || defined(__NetBSD__)
+       username = getlogin();
+ #else
+       username = cuserid(NULL);