From Mark_Andrews@isc.org  Mon Oct 23 14:13:18 2006
Return-Path: <Mark_Andrews@isc.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4CE4116A412
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <Mark_Andrews@isc.org>
Reply-To: Mark Andrews <Mark_Andrews@isc.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: FreeBSD base and misc/zoneinfo conflict with each other
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         104713
>Category:       bin
>Synopsis:       [patch] FreeBSD base and misc/zoneinfo conflict with each other
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    remko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 23 14:20:18 GMT 2006
>Closed-Date:    Sun Aug 26 16:02:47 GMT 2007
>Last-Modified:  Sun Aug 26 16:02:47 GMT 2007
>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 <bsd.subdir.mk>

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->remko 
Responsible-Changed-By: remko 
Responsible-Changed-When: Wed Feb 21 15:25:51 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104713 
State-Changed-From-To: open->patched 
State-Changed-By: remko 
State-Changed-When: Tue Jun 26 19:40:26 UTC 2007 
State-Changed-Why:  
Fixed in -Current will MFC in a little. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104713 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/104713: commit references a PR
Date: Tue, 26 Jun 2007 19:40:11 +0000 (UTC)

 remko       2007-06-26 19:40:03 UTC
 
   FreeBSD src repository
 
   Modified files:
     share                Makefile 
     share/mk             bsd.own.mk 
   Log:
   Make zoneinfo optional so that a filesystem upgrade/update does not overwrite
   possibly installed thirdparte zoneinfo databases (from ports for example).
   
   PR:             bin/104713
   Submitted by:   Mark Andrews <Mark_Andrews at isc dot org> (original patch
                   rewritten by me to be more consistent with the new practise).
   Approved by:    re (kensmith)
   Approved by:    imp (mentor)
   Reviewed by:    ru (some time ago already)
   
   Revision  Changes    Path
   1.37      +5 -1      src/share/Makefile
   1.65      +1 -0      src/share/mk/bsd.own.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: remko 
State-Changed-When: Sun Aug 26 16:02:45 UTC 2007 
State-Changed-Why:  
All relevant bits had been committed to all branches we currently 
support. However I need to update src.conf (regenerate) for -CURRENT to 
match this behaviour (reminded by ceri). Thanks for the patch and the 
patience! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104713 
>Unformatted:
