[pkgsrc/trunk]: pkgsrc/devel/gnustep-make Fix bogus double pwent reuse and ma...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85d5daf489fc
branches:  trunk
changeset: 484071:85d5daf489fc
user:      rh <rh%pkgsrc.org@localhost>
date:      Wed Nov 24 02:37:32 2004 +0000

description:
Fix bogus double pwent reuse and make user lookup actually work in
'user_home'.
Bump PKGREVISION.

diffstat:

 devel/gnustep-make/Makefile         |   3 ++-
 devel/gnustep-make/distinfo         |   3 ++-
 devel/gnustep-make/patches/patch-ab |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r ffe93c7f8c04 -r 85d5daf489fc devel/gnustep-make/Makefile
--- a/devel/gnustep-make/Makefile       Wed Nov 24 00:54:10 2004 +0000
+++ b/devel/gnustep-make/Makefile       Wed Nov 24 02:37:32 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/09/24 01:24:31 rh Exp $
+# $NetBSD: Makefile,v 1.17 2004/11/24 02:37:32 rh Exp $
 
 DISTNAME=      gnustep-make-1.10.0
+PKGREVISION=   1
 CATEGORIES=    devel gnustep
 MASTER_SITES=  ftp://ftp.gnustep.org/pub/gnustep/core/
 
diff -r ffe93c7f8c04 -r 85d5daf489fc devel/gnustep-make/distinfo
--- a/devel/gnustep-make/distinfo       Wed Nov 24 00:54:10 2004 +0000
+++ b/devel/gnustep-make/distinfo       Wed Nov 24 02:37:32 2004 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.10 2004/09/24 01:24:31 rh Exp $
+$NetBSD: distinfo,v 1.11 2004/11/24 02:37:32 rh Exp $
 
 SHA1 (gnustep-make-1.10.0.tar.gz) = 24a4a948d834f8d12173a394ee3966a05f6a6f5f
 Size (gnustep-make-1.10.0.tar.gz) = 372852 bytes
 SHA1 (patch-aa) = 4969ea2cbd61e4bc2dab109abcbbdf5177ebdd8c
+SHA1 (patch-ab) = ee585d5bb5d12f72dff3f0fd3f4c356a8522da38
 SHA1 (patch-ac) = d7616f27ed876125348a3c6c001b3f02029a89d8
 SHA1 (patch-ad) = 4793cb5c75062e6c9b79f9190791f3bfc393779a
 SHA1 (patch-ae) = b7af49c45fed5fb72a7b455b533a23e78f6f20ce
diff -r ffe93c7f8c04 -r 85d5daf489fc devel/gnustep-make/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gnustep-make/patches/patch-ab       Wed Nov 24 02:37:32 2004 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.4 2004/11/24 02:37:32 rh Exp $
+
+--- user_home.c.orig   2004-09-04 06:27:56.000000000 +1000
++++ user_home.c
+@@ -140,6 +140,7 @@ int main (int argc, char** argv)
+ #endif /* HAVE_GETEUID */
+       struct passwd *pwent = getpwuid (uid);
+       loginName = pwent->pw_name;
++      pw = pwent;
+ #endif /* HAVE_GETPWUID */
+ #endif
+       if (loginName == 0)
+@@ -150,7 +151,9 @@ int main (int argc, char** argv)
+     }
+ 
+ #if !defined(__MINGW__)
++#if !HAVE_GETPWUID
+   pw = getpwnam (loginName);
++#endif
+   if (pw == 0)
+     {
+       fprintf(stderr, "Unable to locate home directory for '%s'\n", loginName);