From owner-p4-projects@FreeBSD.ORG  Mon Aug  8 21:50:05 2005
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 5C4BC16A421; Mon,  8 Aug 2005 21:50:05 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 06C7116A41F
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 21:50:05 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ADEE443D45
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 21:50:04 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78Lo48O057753
	for <perforce@freebsd.org>; Mon, 8 Aug 2005 21:50:04 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78Lo4J4057750
	for perforce@freebsd.org; Mon, 8 Aug 2005 21:50:04 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Mon, 8 Aug 2005 21:50:04 GMT
Message-Id: <200508082150.j78Lo4J4057750@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81686 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: Mon, 08 Aug 2005 21:50:06 -0000

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

Change 81686 by soc-andrew@soc-andrew_serv on 2005/08/08 21:49:09

	Catchup to current

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/share/Makefile#3 integrate
.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#4 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/share/Makefile#3 (text+ko) ====

@@ -1,31 +1,56 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/share/Makefile,v 1.33 2005/04/13 10:02:58 phk Exp $
+# $FreeBSD: src/share/Makefile,v 1.35 2005/08/05 14:59:50 phk Exp $
 
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
 SUBDIR=	bsdinstaller \
-	colldef \
+	${_colldef} \
 	${_dict} \
 	${_doc} \
-	examples \
+	${_examples} \
 	${_isdn} \
-	man \
-	me \
+	${_man} \
+	${_me} \
 	misc \
 	mk \
-	mklocale \
-	monetdef \
-	msgdef \
-	numericdef \
+	${_mklocale} \
+	${_monetdef} \
+	${_msgdef} \
+	${_numericdef} \
 	${_sendmail} \
 	skel \
 	snmp \
-	syscons \
+	${_syscons} \
 	tabset \
 	termcap \
-	timedef \
+	${_timedef} \
 	zoneinfo
 
+.if !defined(NO_LOCALES)
+_colldef =	colldef
+_mklocale =	mklocale
+_monetdef =	monetdef
+_msgdef =	msgdef
+_numericdef =	numericdef
+_timedef =	timedef
+.endif
+
+.if !defined(NO_SYSCONS)
+_syscons=	syscons
+.endif
+
+.if !defined(NO_MAN)
+_man=		man
+.endif
+
+.if !defined(NO_GROFF)
+_me=		me
+.endif
+
+.if !defined(NO_EXAMPLES)
+_examples=	examples
+.endif
+
 .if !defined(NO_I4B)
 _isdn=		isdn
 .endif

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.333 2005/07/20 22:53:57 marks Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.334 2005/08/03 09:27:26 phk Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	ac \
@@ -291,7 +291,9 @@
 .endif
 _arlcontrol=	arlcontrol
 _boot0cfg=	boot0cfg
+.if !defined(NO_PCVT)
 _pcvt=		pcvt
+.endif
 _wlconfig=	wlconfig
 .elif ${MACHINE} == "pc98"
 _boot98cfg=	boot98cfg