head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.26
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.24
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.22
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.20
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.18
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.16
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.14
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.12
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.10
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.8
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.6
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.4
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.1.0.10
	pkgsrc-2007Q1-base:1.1
	XFCE-4_2_x:1.1
	pkgsrc-2006Q4:1.1.0.8
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.6
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.4
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.2
	pkgsrc-2006Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.04.12.09.55.26;	author martti;	state dead;
branches;
next	1.1;

1.1
date	2006.03.20.06.29.09;	author martti;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Updated to Xfce 4.4.1

See http://www.xfce.org/documentation/changelogs/4.4.1 for details.
@
text
@$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
@


1.1
log
@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.
@
text
@d1 1
a1 1
$NetBSD$
@