From owner-svn-src-head@FreeBSD.ORG  Wed Oct 21 20:59:13 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CB2C1065693;
	Wed, 21 Oct 2009 20:59:13 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C9A58FC26;
	Wed, 21 Oct 2009 20:59:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9LKxDCL010449;
	Wed, 21 Oct 2009 20:59:13 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9LKxDDQ010447;
	Wed, 21 Oct 2009 20:59:13 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200910212059.n9LKxDDQ010447@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 21 Oct 2009 20:59:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198351 - head/share/zoneinfo
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Oct 2009 20:59:13 -0000

Author: edwin
Date: Wed Oct 21 20:59:12 2009
New Revision: 198351
URL: http://svn.freebsd.org/changeset/base/198351

Log:
  After the installation of the /usr/share/zoneinfo, run tzsetup if
  /var/db/zoneinfo exists.
  
  MFC after:	1 week

Modified:
  head/share/zoneinfo/Makefile

Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile	Wed Oct 21 20:55:04 2009	(r198350)
+++ head/share/zoneinfo/Makefile	Wed Oct 21 20:59:12 2009	(r198351)
@@ -54,4 +54,24 @@ beforeinstall:
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
 
+afterinstall:
+	@#
+	@# If the file /var/db/zoneinfo exists, and it is owned by root:wheel,
+	@# and the contents of it exists in /usr/share/zoneinfo, then reinstall
+	@# it.
+	@#
+	@if [ -f ${DESTDIR}/var/db/zoneinfo -a -O ${DESTDIR}/var/db/zoneinfo \
+	    -a -G ${DESTDIR}/var/db/zoneinfo ]; then \
+		zf=$$(cat ${DESTDIR}/var/db/zoneinfo); \
+		if [ -f ${DESTDIR}/usr/share/zoneinfo/$${zf} ]; then \
+			if [ ! -z "${DESTDIR}" ]; then \
+				optC="-C ${DESTDIR}"; \
+			fi; \
+			echo "Updating /etc/localtime"; \
+			tzsetup ${optC} -r; \
+		fi; \
+	else \
+		echo "Run tzsetup(8) manually to update /etc/localtime."; \
+	fi
+
 .include <bsd.prog.mk>