From owner-p4-projects@FreeBSD.ORG  Thu Dec 27 00:13:37 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6ED6516A41B; Thu, 27 Dec 2007 00:13:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D1B3F16A419
	for <perforce@freebsd.org>; Thu, 27 Dec 2007 00:13:36 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C5F6613C46E
	for <perforce@freebsd.org>; Thu, 27 Dec 2007 00:13:36 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBR0DaSa029029
	for <perforce@freebsd.org>; Thu, 27 Dec 2007 00:13:36 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBR0DaLM029024
	for perforce@freebsd.org; Thu, 27 Dec 2007 00:13:36 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 27 Dec 2007 00:13:36 GMT
Message-Id: <200712270013.lBR0DaLM029024@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 131743 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: Thu, 27 Dec 2007 00:13:37 -0000

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

Change 131743 by peter@peter_overcee on 2007/12/27 00:13:30

	Create ${MK_SVN} and use it to control hook linkage.

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#130 edit
.. //depot/projects/hammer/share/mk/bsd.own.mk#22 edit
.. //depot/projects/hammer/usr.bin/Makefile#57 edit

Differences ...

==== //depot/projects/hammer/Makefile.inc1#130 (text+ko) ====

@@ -1081,7 +1081,8 @@
 _default_thread_lib=	lib/libkse
 .endif
 
-_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib usr.bin/svn/lib
+_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} \
+		usr.bin/lex/lib ${_svn_lib}
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
@@ -1089,6 +1090,10 @@
 _cddl_lib= cddl/lib
 .endif
 
+.if ${MK_SVN} != "no"
+_svn_lib=	usr.bin/svn/lib
+.endif
+
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"
 _secure_lib_libcrypto= secure/lib/libcrypto

==== //depot/projects/hammer/share/mk/bsd.own.mk#22 (text+ko) ====

@@ -355,6 +355,7 @@
     SETUID_LOGIN \
     SHAREDOCS \
     SSP \
+    SVN \
     SYMVER \
     SYSCONS \
     TCSH \

==== //depot/projects/hammer/usr.bin/Makefile#57 (text+ko) ====

@@ -173,6 +173,7 @@
 	split \
 	stat \
 	su \
+	${_svn} \
 	systat \
 	tabs \
 	tail \
@@ -290,6 +291,10 @@
 _vacation=	vacation
 .endif
 
+.if ${MK_SVN} != "no"
+_svn=		svn
+.endif
+
 .if ${MK_TOOLCHAIN} != "no"
 _c89=		c89
 _c99=		c99