From owner-svn-src-all@FreeBSD.ORG  Thu Feb 25 06:44:17 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 249C4106564A;
	Thu, 25 Feb 2010 06:44:17 +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 13AB68FC14;
	Thu, 25 Feb 2010 06:44:17 +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 o1P6iGpn032820;
	Thu, 25 Feb 2010 06:44:16 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1P6iG7g032818;
	Thu, 25 Feb 2010 06:44:16 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201002250644.o1P6iG7g032818@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 25 Feb 2010 06:44:16 +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: r204300 - head/share/zoneinfo
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 06:44:17 -0000

Author: edwin
Date: Thu Feb 25 06:44:16 2010
New Revision: 204300
URL: http://svn.freebsd.org/changeset/base/204300

Log:
  Officially speaking, the zoneinfo data files are contributed data.
  Therefore treat them as such.

Deleted:
  head/share/zoneinfo/africa
  head/share/zoneinfo/antarctica
  head/share/zoneinfo/asia
  head/share/zoneinfo/australasia
  head/share/zoneinfo/backward
  head/share/zoneinfo/etcetera
  head/share/zoneinfo/europe
  head/share/zoneinfo/factory
  head/share/zoneinfo/leapseconds
  head/share/zoneinfo/northamerica
  head/share/zoneinfo/pacificnew
  head/share/zoneinfo/southamerica
  head/share/zoneinfo/systemv
  head/share/zoneinfo/yearistype.sh
  head/share/zoneinfo/zone.tab
Modified:
  head/share/zoneinfo/Makefile

Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile	Thu Feb 25 06:35:21 2010	(r204299)
+++ head/share/zoneinfo/Makefile	Thu Feb 25 06:44:16 2010	(r204300)
@@ -29,6 +29,8 @@
 #
 
 CLEANFILES+=	yearistype
+CONTRIBDIR=	${.CURDIR}/../../contrib/tzdata/
+.PATH:		${CONTRIBDIR}
 
 .if defined(LEAPSECONDS)
 LEAPFILE=	-L leapseconds
@@ -44,6 +46,8 @@ POSIXRULES=	America/New_York
 TZFILES+=	backward systemv
 .endif
 
+TZFILES:=	${TZFILES:S/^/${CONTRIBDIR}/}
+
 all: yearistype
 
 beforeinstall:
@@ -52,7 +56,7 @@ beforeinstall:
 	    -u ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	    ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
+	    ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
 
 afterinstall:
 #