[pkgsrc/trunk]: pkgsrc/x11/gnome2-control-center Unbreak build on DragonFly a...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/afbcc534a2d5
branches:  trunk
changeset: 518979:afbcc534a2d5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 24 20:00:14 2006 +0000

description:
Unbreak build on DragonFly and other systems without getpwuid_r
by just always using getpwuid. Since the applet is not threaded
anyway, it doesn't make a difference. Bump revision.

OK jmmv@

diffstat:

 x11/gnome2-control-center/Makefile         |   4 ++--
 x11/gnome2-control-center/distinfo         |   3 ++-
 x11/gnome2-control-center/patches/patch-ab |  26 ++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 6428ed5cd01c -r afbcc534a2d5 x11/gnome2-control-center/Makefile
--- a/x11/gnome2-control-center/Makefile        Sun Sep 24 19:09:44 2006 +0000
+++ b/x11/gnome2-control-center/Makefile        Sun Sep 24 20:00:14 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2006/09/16 12:20:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.71 2006/09/24 20:00:14 joerg Exp $
 #
 
 DISTNAME=      control-center-2.16.0
 PKGNAME=       gnome2-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/control-center/2.16/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 6428ed5cd01c -r afbcc534a2d5 x11/gnome2-control-center/distinfo
--- a/x11/gnome2-control-center/distinfo        Sun Sep 24 19:09:44 2006 +0000
+++ b/x11/gnome2-control-center/distinfo        Sun Sep 24 20:00:14 2006 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.28 2006/09/15 15:12:40 jmmv Exp $
+$NetBSD: distinfo,v 1.29 2006/09/24 20:00:14 joerg Exp $
 
 SHA1 (control-center-2.16.0.tar.bz2) = c73e614c3ba287202ca12f19029f15bab293690b
 RMD160 (control-center-2.16.0.tar.bz2) = 85c8d8de2d9643581c89f468e1714be049c375af
 Size (control-center-2.16.0.tar.bz2) = 1986964 bytes
 SHA1 (patch-aa) = 588d06dfbf0b2cb5e244058a5b80f75a0faa4e29
+SHA1 (patch-ab) = c0561975640562546f612e252a9d239d6dbc695b
 SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
 SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531
diff -r 6428ed5cd01c -r afbcc534a2d5 x11/gnome2-control-center/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome2-control-center/patches/patch-ab        Sun Sep 24 20:00:14 2006 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.5 2006/09/24 20:00:14 joerg Exp $
+
+--- capplets/about-me/gnome-about-me.c.orig    2006-09-24 20:42:14.000000000 +0000
++++ capplets/about-me/gnome-about-me.c
+@@ -267,16 +267,12 @@ static char *
+ get_user_login (void)
+ {
+       char buf[LINE_MAX * 4];
+-      struct passwd pwd, *err;
++      struct passwd *pwd;
+ 
+-      int i;
+-#if __sun
+-      i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
+-      return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
+-#else
+-      i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
+-      return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
+-#endif
++      pwd = getpwuid (getuid ());
++      if (pwd == NULL)
++              return NULL;
++      return g_strdup (pwd->pw_name);
+ }
+ 
+ /*