From owner-freebsd-bugs Sat Sep 16 20:10:13 2000 Delivered-To: freebsd-bugs@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0008937B424 for ; Sat, 16 Sep 2000 20:10:00 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id UAA93247; Sat, 16 Sep 2000 20:10:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from dt051n37.san.rr.com (dt051n37.san.rr.com [204.210.32.55]) by hub.freebsd.org (Postfix) with ESMTP id 037A737B423 for ; Sat, 16 Sep 2000 20:07:18 -0700 (PDT) Received: (from doug@localhost) by dt051n37.san.rr.com (8.9.3/8.9.3) id UAA51604; Sat, 16 Sep 2000 20:07:17 -0700 (PDT) (envelope-from doug) Message-Id: <200009170307.UAA51604@dt051n37.san.rr.com> Date: Sat, 16 Sep 2000 20:07:17 -0700 (PDT) From: DougB@gorean.org Reply-To: DougB@gorean.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: bin/21321: [PATCHES] Finish the job of conditionalizing UUCP Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21321 >Category: bin >Synopsis: [PATCHES] Finish the job of conditionalizing UUCP >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Sep 16 20:10:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Doug >Release: FreeBSD 3.5.1-STABLE-0903 i386 >Organization: AAAG >Environment: Any FreeBSD system >Description: 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. >How-To-Repeat: DNA >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: 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 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 For RELENG_3: 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 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 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 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 Enjoy, Doug >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message