PERFORCE change 81686 for review

[soc-andrew]

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

Change 81686 by soc-andrew at 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