Bug 21321

	Back in March Dan started the process of making building the UUCP
	stuff conditional on the 'NOUUCP' flag in make.conf. The attached
	patches complete that process, mostly by taking the etc stuff
	into account. Several people have expressed interest in these
	patches, but no one has committed them yet.

Fix: Apply the following patch sets. The first should apply cleanly to
	both RELENG_4 and -Current. The second is for RELENG_3, in case
	anyone is interested in adding that. I know it's late, but I've had
	these patches sitting around for a while now. :) I've used them on
	systems of all 3 vintages and have never seen any ill effects.

For RELENG_4 and -Current:

For RELENG_3:



Enjoy,

Doug--2UcHYSRztJlhXOR2mFSknjZV0JZZDdLCqDvwmAipfPZalZXe
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: bin/Makefile
===================================================================
RCS file: /usr/ncvs/src/bin/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- bin/Makefile	2000/04/17 20:32:13	1.16
+++ bin/Makefile	2000/09/11 06:46:34
@@ -34,7 +34,7 @@
 SUBDIR+=csh
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if !defined(NO_SENDMAIL) && !defined(NOUUCP)
 SUBDIR+=rmail
 .endif
 
Index: etc/Makefile
===================================================================
RCS file: /usr/ncvs/src/etc/Makefile,v
retrieving revision 1.236
diff -u -r1.236 Makefile
--- etc/Makefile	2000/09/06 18:16:32	1.236
+++ etc/Makefile	2000/09/11 00:55:09
@@ -70,7 +70,6 @@
 	    master.passwd ${DESTDIR}/etc; \
 	( cd ${.CURDIR}/periodic; ${MAKE} install ); \
 	( cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall ); \
-	( cd ${.CURDIR}/../gnu/libexec/uucp/sample; ${MAKE} install ); \
 	( cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ); \
 	( cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt ); \
 	( cd ${.CURDIR}/sendmail; ${MAKE} etc-sendmail.cf ); \
@@ -78,6 +77,9 @@
 	pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	     MAKEDEV.local MAKEDEV ${DESTDIR}/dev )
+.if !defined(NOUUCP)
+	( cd ${.CURDIR}/../gnu/libexec/uucp/sample; ${MAKE} install )
+.endif
 .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSH)
 	(cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSH} \
 	    ${DESTDIR}/etc/ssh )
Index: etc/periodic/daily/Makefile
===================================================================
RCS file: /usr/ncvs/src/etc/periodic/daily/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- etc/periodic/daily/Makefile	1999/11/04 03:00:33	1.4
+++ etc/periodic/daily/Makefile	2000/03/25 07:08:22
@@ -13,14 +13,16 @@
 	310.accounting \
 	320.rdist \
 	330.news \
-	340.uucp \
 	400.status-disks \
-	410.status-uucp \
 	420.status-network \
 	430.status-rwho \
 	440.status-mailq \
 	450.status-security \
 	460.status-mail-rejects \
 	999.local
+.if !defined(NOUUCP)
+BIN+=	340.uucp \
+	410.status-uucp
+.endif
 
 .include <bsd.prog.mk>
Index: etc/periodic/weekly/Makefile
===================================================================
RCS file: /usr/ncvs/src/etc/periodic/weekly/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- etc/periodic/weekly/Makefile	2000/06/28 14:37:22	1.5
+++ etc/periodic/weekly/Makefile	2000/06/29 02:50:36
@@ -1,12 +1,14 @@
 # $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.5 2000/06/28 14:37:22 joe Exp $
 
 BIN=	120.clean-kvmdb \
-	300.uucp \
 	310.locate \
 	320.whatis \
 	330.catman \
 	340.noid \
 	400.status-pkg \
 	999.local
+.if !defined(NOUUCP)
+BIN+=	300.uucp
+.endif
 
 .include <bsd.prog.mk>
How-To-Repeat: 
	DNA