[pkgsrc/trunk]: pkgsrc/x11/xfce4-utils Updated x11/xfce4-utils to 4.2.3nb3

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbcc36e667c5
branches:  trunk
changeset: 509957:cbcc36e667c5
user:      martti <martti%pkgsrc.org@localhost>
date:      Mon Mar 20 06:29:09 2006 +0000

description:
Updated x11/xfce4-utils to 4.2.3nb3

Fix the 'id -u' issue on Solaris (pkg/33027). The remaining changes (like
sshagent startup) should go via xfce.org.

diffstat:

 x11/xfce4-utils/Makefile         |   5 ++---
 x11/xfce4-utils/buildlink3.mk    |   4 ++--
 x11/xfce4-utils/distinfo         |   3 ++-
 x11/xfce4-utils/patches/patch-ab |  23 +++++++++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diffs (74 lines):

diff -r e5e96984d4d8 -r cbcc36e667c5 x11/xfce4-utils/Makefile
--- a/x11/xfce4-utils/Makefile  Mon Mar 20 05:53:00 2006 +0000
+++ b/x11/xfce4-utils/Makefile  Mon Mar 20 06:29:09 2006 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/20 06:29:09 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=      xfce-utils-${XFCE4_VERSION}
 PKGNAME=       xfce4-utils-${XFCE4_VERSION}
-#PKGREVISION=  1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 COMMENT=       Xfce utilities
 
diff -r e5e96984d4d8 -r cbcc36e667c5 x11/xfce4-utils/buildlink3.mk
--- a/x11/xfce4-utils/buildlink3.mk     Mon Mar 20 05:53:00 2006 +0000
+++ b/x11/xfce4-utils/buildlink3.mk     Mon Mar 20 06:29:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/03/20 06:29:09 martti Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=    ${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-utils+=        xfce4-utils>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-utils?=    xfce4-utils>=4.2.3nb2
+BUILDLINK_RECOMMENDED.xfce4-utils?=    xfce4-utils>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-utils?=      ../../x11/xfce4-utils
 .endif # XFCE4_UTILS_BUILDLINK3_MK
 
diff -r e5e96984d4d8 -r cbcc36e667c5 x11/xfce4-utils/distinfo
--- a/x11/xfce4-utils/distinfo  Mon Mar 20 05:53:00 2006 +0000
+++ b/x11/xfce4-utils/distinfo  Mon Mar 20 06:29:09 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.14 2006/03/20 06:29:09 martti Exp $
 
 SHA1 (xfce-utils-4.2.3.tar.gz) = a19e68dd676743636dec80d9ce2b0d6149c7a315
 RMD160 (xfce-utils-4.2.3.tar.gz) = acbe18beeac5a2b6d4866ec98343d4fc98b4dd12
 Size (xfce-utils-4.2.3.tar.gz) = 1303388 bytes
 SHA1 (patch-aa) = deafbcd8b3c367d377aa25416c9d25043f907e60
+SHA1 (patch-ab) = 39c4fd41775cefc4cc2f10bc86060d9bbcc7b795
diff -r e5e96984d4d8 -r cbcc36e667c5 x11/xfce4-utils/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce4-utils/patches/patch-ab  Mon Mar 20 06:29:09 2006 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2006/03/20 06:29:09 martti Exp $
+
+--- scripts/xinitrc.orig       2005-11-05 19:03:34.000000000 +0200
++++ scripts/xinitrc    2006-03-20 06:20:23.000000000 +0200
+@@ -1,8 +1,17 @@
+ #!/bin/sh
+ 
+ # fix broken $UID on some system...
++OPSYS=`uname -s`
++case "$OPSYS" in
++      *SunOS*)
++              ID_EXEC=/usr/xpg4/bin/id
++              ;;
++      *)
++              ID_EXEC=id
++              ;;
++esac
+ if test "x$UID" = "x"; then
+-      UID=`id -u`
++      UID=`$ID_EXEC -u`
+ fi
+ 
+ # create temp file for X resources