From owner-p4-projects@FreeBSD.ORG  Fri Jun 22 19:03:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DBB1016A46D; Fri, 22 Jun 2007 19:03:32 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5011F16A421
	for <perforce@freebsd.org>; Fri, 22 Jun 2007 19:03:32 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 43A0313C4BA
	for <perforce@freebsd.org>; Fri, 22 Jun 2007 19:03:32 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5MJ3Wlu073080
	for <perforce@freebsd.org>; Fri, 22 Jun 2007 19:03:32 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MJ3WU7073077
	for perforce@freebsd.org; Fri, 22 Jun 2007 19:03:32 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 22 Jun 2007 19:03:32 GMT
Message-Id: <200706221903.l5MJ3WU7073077@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>
Cc: 
Subject: PERFORCE change 122165 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 22 Jun 2007 19:03:33 -0000

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

Change 122165 by peter@peter_daintree on 2007/06/22 19:03:15

	Attempt to recover from makefile reordering

Affected files ...

.. //depot/projects/hammer/etc/Makefile#54 edit

Differences ...

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

@@ -130,6 +130,23 @@
 .if ${MK_I4B} != "no"
 	cd ${.CURDIR}/isdn; ${MAKE} install
 .endif
+.if ${MK_BIND_ETC} != "no"
+.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
+.if !defined(NO_BIND_CHROOT)
+.if ${MK_BIND_MTREE} != "no"
+	@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
+		set -x; \
+		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
+	fi
+.endif
+.endif
 .if ${MK_SENDMAIL} != "no"
 	cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
@@ -158,23 +175,6 @@
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
-.if ${MK_BIND_ETC} != "no"
-.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
-.if !defined(NO_BIND_CHROOT)
-.if ${MK_BIND_MTREE} != "no"
-	@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
-		set -x; \
-		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
-	fi
-.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 \