From owner-freebsd-bugs@FreeBSD.ORG Mon Oct 23 14:20:20 2006 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19D3616A40F for ; Mon, 23 Oct 2006 14:20:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BC5C43D55 for ; Mon, 23 Oct 2006 14:20:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k9NEKJam048946 for ; Mon, 23 Oct 2006 14:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k9NEKJVX048945; Mon, 23 Oct 2006 14:20:19 GMT (envelope-from gnats) Resent-Date: Mon, 23 Oct 2006 14:20:19 GMT Resent-Message-Id: <200610231420.k9NEKJVX048945@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mark Andrews Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CE4116A412 for ; Mon, 23 Oct 2006 14:13:18 +0000 (UTC) (envelope-from Mark_Andrews@isc.org) Received: from mx.isc.org (mx.isc.org [204.152.184.167]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD39C43D70 for ; Mon, 23 Oct 2006 14:13:11 +0000 (GMT) (envelope-from Mark_Andrews@isc.org) Received: from farside.isc.org (farside.isc.org [IPv6:2001:4f8:3:bb::5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "farside.isc.org", Issuer "ISC CA" (verified OK)) by mx.isc.org (Postfix) with ESMTP id 7BB5111401B for ; Mon, 23 Oct 2006 14:13:11 +0000 (UTC) (envelope-from Mark_Andrews@isc.org) Received: from bsdi.dv.isc.org (localhost.isc.org [IPv6:::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by farside.isc.org (Postfix) with ESMTP id E1AA5E6078 for ; Mon, 23 Oct 2006 14:13:10 +0000 (UTC) (envelope-from marka@isc.org) Received: from bsdi.dv.isc.org (localhost.dv.isc.org [127.0.0.1]) by bsdi.dv.isc.org (8.13.8/8.13.4) with ESMTP id k9N5CZm0074757 for ; Mon, 23 Oct 2006 15:12:35 +1000 (EST) (envelope-from marka@bsdi.dv.isc.org) Received: (from marka@localhost) by bsdi.dv.isc.org (8.13.8/8.13.4/Submit) id k9N5CY8R074651; Mon, 23 Oct 2006 15:12:34 +1000 (EST) (envelope-from marka) Message-Id: <200610230512.k9N5CY8R074651@bsdi.dv.isc.org> Date: Mon, 23 Oct 2006 15:12:34 +1000 (EST) From: Mark Andrews To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/104713: FreeBSD base and misc/zoneinfo conflict with each other X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Mark Andrews List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Oct 2006 14:20:20 -0000 >Number: 104713 >Category: bin >Synopsis: FreeBSD base and misc/zoneinfo conflict with each other >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Oct 23 14:20:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Mark Andrews >Release: FreeBSD 4.11-STABLE i386 >Organization: ISC >Environment: System: FreeBSD bsdi.dv.isc.org 4.11-STABLE FreeBSD 4.11-STABLE #30: Mon Oct 23 08:56:59 EST 2006 marka@bsdi.dv.isc.org:/usr/obj/usr/src/sys/BSDI i386 >Description: misc/zoneinfo by default installs into /usr/share. This means whenever the OS is updated one has to re-install misc/zoneinfo. >How-To-Repeat: >Fix: Make the installation of zoneinfo conditional Index: share/Makefile =================================================================== RCS file: /home/ncvs/src/share/Makefile,v retrieving revision 1.22.2.4 diff -u -r1.22.2.4 Makefile --- share/Makefile 12 Mar 2002 17:13:32 -0000 1.22.2.4 +++ share/Makefile 23 Oct 2006 05:04:34 -0000 @@ -4,7 +4,7 @@ # Do not include `info' in the SUBDIR list, it is handled separately. SUBDIR= colldef dict examples man me misc mk mklocale monetdef \ - msgdef numericdef skel syscons tabset termcap timedef zoneinfo + msgdef numericdef skel syscons tabset termcap timedef .if !defined(NO_SHAREDOCS) SUBDIR+= doc @@ -18,4 +18,8 @@ SUBDIR+= sendmail .endif +.if !defined(NO_ZONEINFO) +SUBDIR+= zoneinfo +.endif + .include >Release-Note: >Audit-Trail: >Unformatted: