[pkgsrc/pkgsrc-2004Q2]: pkgsrc Pullup ticket 44 to the pkgsrc-2004Q2 branch, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbe8f2f57e23
branches:  pkgsrc-2004Q2
changeset: 476709:fbe8f2f57e23
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jul 06 22:39:37 2004 +0000

description:
Pullup ticket 44 to the pkgsrc-2004Q2 branch, requested by Grant Beattie.

        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Thu Jul  1 13:18:20 UTC 2004

        Modified Files:
                pkgsrc/mk/bulk: mksandbox

        Log Message:
        the timezone file on Solaris is /etc/TIMEZONE.

diffstat:

 doc/CHANGES-pkgsrc-2004Q2 |   3 ++-
 mk/bulk/mksandbox         |  12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 992b577dbeca -r fbe8f2f57e23 doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Tue Jul 06 22:36:56 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Tue Jul 06 22:39:37 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.8 2004/07/06 22:36:56 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.9 2004/07/06 22:39:37 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -10,4 +10,5 @@
 Pullup ticket 41, requested by Matthias Drochner [agc 2004-07-06]
 Pullup ticket 42, requested by Dieter Baron [agc 2004-07-06]
 Pullup ticket 43, requested by Gavan Fantom [agc 2004-07-06]
+Pullup ticket 44, requested by Grant Beattie [agc 2004-07-06]
 
diff -r 992b577dbeca -r fbe8f2f57e23 mk/bulk/mksandbox
--- a/mk/bulk/mksandbox Tue Jul 06 22:36:56 2004 +0000
+++ b/mk/bulk/mksandbox Tue Jul 06 22:39:37 2004 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.33 2004/06/06 01:33:17 grant Exp $
+# $NetBSD: mksandbox,v 1.33.2.1 2004/07/06 22:39:37 agc Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -220,7 +220,15 @@
 *)     (cd /etc; $paxprog -rwpe . $sandbox/etc) ;;
 esac
 rm -f $sandbox/etc/localtime
-$cpprog /usr/share/zoneinfo/GMT $sandbox/etc/localtime
+
+case "$opsys" in
+SunOS)
+       $cpprog /etc/TIMEZONE $sandbox/etc/TIMEZONE
+       ;;
+*)
+       $cpprog /usr/share/zoneinfo/GMT $sandbox/etc/localtime
+       ;;
+esac
 
 echo "Make empty dirs upon which to mount the null mounts"
 for d in $sandboxMountDirs; do