From owner-p4-projects@FreeBSD.ORG  Sun Oct  3 23:05:57 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8525016A4D0; Sun,  3 Oct 2004 23:05:57 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 619B116A4CE
	for <perforce@freebsd.org>; Sun,  3 Oct 2004 23:05:57 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 550D943D2F
	for <perforce@freebsd.org>; Sun,  3 Oct 2004 23:05:57 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i93N5vkP013103
	for <perforce@freebsd.org>; Sun, 3 Oct 2004 23:05:57 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i93N5v3A013100
	for perforce@freebsd.org; Sun, 3 Oct 2004 23:05:57 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 3 Oct 2004 23:05:57 GMT
Message-Id: <200410032305.i93N5v3A013100@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 62612 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Oct 2004 23:05:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=62612

Change 62612 by peter@peter_overcee on 2004/10/03 23:05:11

	unwind some of the useless bind chroot crud.

Affected files ...

.. //depot/projects/hammer/etc/Makefile#30 edit
.. //depot/projects/hammer/etc/mtree/BIND.etc.dist#1 add
.. //depot/projects/hammer/etc/mtree/BIND.var.dist#1 add

Differences ...

==== //depot/projects/hammer/etc/Makefile#30 (text+ko) ====

@@ -123,9 +123,14 @@
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
 .if !defined(NO_BIND_ETC) && !defined(NO_BIND)
+.if defined(NO_BIND_CHROOT)
+	cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+	    ${NAMEDB} ${DESTDIR}/etc/namedb
+.else
 	cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${NAMEDB} ${DESTDIR}/var/named/etc/namedb
 .endif
+.endif
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
@@ -184,10 +189,17 @@
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
 	    -p ${DESTDIR}/usr/include
 .endif
+.if defined(NO_BIND_CHROOT)
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.etc.dist \
+	    -p ${DESTDIR}/etc
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.var.dist \
+	    -p ${DESTDIR}/var
+.else
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
 	    -p ${DESTDIR}/var/named
 	ln -fhs ${DESTDIR}/var/named/etc/namedb ${DESTDIR}/etc/namedb
 .endif
+.endif
 .if !defined(NO_SENDMAIL)
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
 .endif