Attachment 10660 Details for Bug 21321 – file.diff

[patch] file.diff

file.diff (text/plain), 4.44 KB, created by DougB on 2000-09-17 04:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: DougB

Created: 2000-09-17 04:10:00 UTC

Size: 4.44 KB

patch

obsolete

>Index: bin/Makefile
>===================================================================
>RCS file: /usr/ncvs/src/bin/Makefile,v
>retrieving revision 1.14.2.1
>diff -u -r1.14.2.1 Makefile
>--- bin/Makefile	1999/08/29 14:11:19	1.14.2.1
>+++ bin/Makefile	2000/03/25 05:53:50
>@@ -31,7 +31,7 @@
> 	sync \
> 	test
> 
>-.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.187.2.14
>diff -u -r1.187.2.14 Makefile
>--- etc/Makefile	2000/08/28 20:26:15	1.187.2.14
>+++ etc/Makefile	2000/09/03 22:40:21
>@@ -59,7 +59,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 ); \
>@@ -116,6 +115,9 @@
> 	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FREEBSD} \
> 		${DESTDIR}/)
> 	(cd ${.CURDIR}/../share/man; ${MAKE} makedb; )
>+.if !defined(NOUUCP)
>+	( cd ${.CURDIR}/../gnu/libexec/uucp/sample; ${MAKE} install )
>+.endif
> 
> distrib-dirs:
> 	mtree -deU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
>Index: etc/periodic/daily/Makefile
>===================================================================
>RCS file: /usr/ncvs/src/etc/periodic/daily/Makefile,v
>retrieving revision 1.2.2.1
>diff -u -r1.2.2.1 Makefile
>--- etc/periodic/daily/Makefile	1999/08/29 14:19:45	1.2.2.1
>+++ etc/periodic/daily/Makefile	2000/03/25 06:04:18
>@@ -12,14 +12,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.3.2.1
>diff -u -r1.3.2.1 Makefile
>--- etc/periodic/weekly/Makefile	1999/08/29 14:19:54	1.3.2.1
>+++ etc/periodic/weekly/Makefile	2000/03/25 06:05:17
>@@ -1,11 +1,13 @@
> # $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.3.2.1 1999/08/29 14:19:54 peter Exp $
> 
> BIN=	120.clean-kvmdb \
>-	300.uucp \
> 	310.locate \
> 	320.whatis \
> 	330.catman \
> 	340.noid \
> 	999.local
>+.if !defined(NOUUCP)
>+BIN+=	300.uucp
>+.endif
> 
> .include <bsd.prog.mk>
>Index: gnu/libexec/Makefile
>===================================================================
>RCS file: /usr/ncvs/src/gnu/libexec/Makefile,v
>retrieving revision 1.5.2.1
>diff -u -r1.5.2.1 Makefile
>--- gnu/libexec/Makefile	1999/08/29 14:29:07	1.5.2.1
>+++ gnu/libexec/Makefile	2000/03/25 06:15:42
>@@ -1,5 +1,7 @@
>-# $FreeBSD: src/gnu/libexec/Makefile,v 1.5.2.1 1999/08/29 14:29:07 peter Exp $
>+# $FreeBSD: src/gnu/libexec/Makefile,v 1.7 2000/03/20 17:10:16 dan Exp $
> 
>+.if !defined(NOUUCP)
> SUBDIR=	uucp
>+.endif
> 
> .include <bsd.subdir.mk>
>Index: libexec/Makefile
>===================================================================
>RCS file: /usr/ncvs/src/libexec/Makefile,v
>retrieving revision 1.37.2.3
>diff -u -r1.37.2.3 Makefile
>--- libexec/Makefile	1999/12/13 15:08:13	1.37.2.3
>+++ libexec/Makefile	2000/03/25 05:56:45
>@@ -5,7 +5,7 @@
> SUBDIR=	atrun bootpd comsat fingerd ftpd getNAME getty \
> 	makekey mknetid pppoed rbootd revnetgroup rexecd \
> 	rlogind rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld \
>-	rpc.sprayd rshd talkd tftpd uucpd xtend ypxfr
>+	rpc.sprayd rshd talkd tftpd xtend ypxfr
> 
> .if !defined(NO_BIND)
> SUBDIR+=named-xfer
>@@ -13,6 +13,10 @@
> 
> .if !defined(NO_SENDMAIL)
> SUBDIR+=mail.local smrsh
>+.endif
>+
>+.if !defined(NOUUCP)
>+SUBDIR+=uucpd
> .endif
> 
> .if ${OBJFORMAT} == aout
>Index: etc/make.conf
>===================================================================
>RCS file: /usr/ncvs/src/etc/Attic/make.conf,v
>retrieving revision 1.73.2.11
>diff -u -r1.73.2.11 make.conf
>--- etc/make.conf	2000/04/10 19:55:02	1.73.2.11
>+++ etc/make.conf	2000/09/17 02:45:12
>@@ -40,6 +40,9 @@
> # To avoid compiling in XWindows support (e.g. in doscmd)
> #NO_X=		true
> #
>+# To avoid building uucp related programs
>+#NOUUCP=	true
>+#
> # To have 'obj' symlinks created in your source directory
> #       (they aren't needed/necessary)
> #OBJLINK=	yes

Actions: View | Diff

Attachments on bug 21321: 10660