diff --git a/etc/Makefile b/etc/Makefile index 46f262dd081b..bdec982e0308 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -85,9 +85,6 @@ distribution: .if !defined(NO_SENDMAIL) ( cd ${.CURDIR}/sendmail; ${MAKE} distribution ); .endif -.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 ) diff --git a/etc/periodic/daily/340.uucp b/etc/periodic/daily/340.uucp deleted file mode 100755 index 120c8747b90c..000000000000 --- a/etc/periodic/daily/340.uucp +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Local cleanup of UUCP files. This is for backwards compatibility, -# /etc/uuclean.daily doesn't exist by default. -# - -# If there is a global system configuration file, suck it in. -# -if [ -r /etc/defaults/periodic.conf ] -then - . /etc/defaults/periodic.conf - source_periodic_confs -fi - -case "$daily_uuclean_enable" in - [Yy][Ee][Ss]) - if [ ! -d /var/spool/uucp ] - then - echo '$daily_uuclean_enable is set, but /var/spool/uucp' \ - "doesn't exist" - rc=2 - elif [ ! -f /etc/uuclean.daily ] - then - echo '$daily_uuclean_enable is set, but /etc/uuclean.daily' \ - "doesn't exist" - rc=2 - else - echo "" - echo "Cleaning up UUCP:" - - echo /etc/uuclean.daily | su -m uucp && rc=0 || rc=3 - fi;; - - *) rc=0;; -esac - -exit $rc diff --git a/etc/periodic/daily/410.status-uucp b/etc/periodic/daily/410.status-uucp deleted file mode 100755 index 0b086ab41720..000000000000 --- a/etc/periodic/daily/410.status-uucp +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If there is a global system configuration file, suck it in. -# -if [ -r /etc/defaults/periodic.conf ] -then - . /etc/defaults/periodic.conf - source_periodic_confs -fi - -case "$daily_status_uucp_enable" in - [Yy][Ee][Ss]) - if [ ! -d /var/spool/uucp ] - then - echo '$daily_status_uucp_enable is set but /var/spool/uucp' \ - "doesn't exist" - rc=2 - elif [ ! -x /usr/bin/uustat ] - then - echo '$daily_status_uucp_enable is set but /usr/bin/uustat' \ - "isn't executable" - rc=2 - else - echo "" - echo "UUCP status:" - - (echo "/usr/bin/uustat -a" | su -fm uucp ) && rc=0 || rc=3 - fi;; - - *) rc=0;; -esac - -exit $rc diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index ea51b43cb72d..f0fa19a055a9 100644 --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -22,9 +22,5 @@ BIN= 100.clean-disks \ 470.status-named \ 500.queuerun \ 999.local -.if !defined(NOUUCP) -BIN+= 340.uucp \ - 410.status-uucp -.endif .include diff --git a/etc/periodic/weekly/300.uucp b/etc/periodic/weekly/300.uucp deleted file mode 100755 index 1d146bc05cba..000000000000 --- a/etc/periodic/weekly/300.uucp +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# -# $FreeBSD$ -# -# This is really here for backwards compatibility, clean.weekly is not -# created by default anymore. - -# If there is a global system configuration file, suck it in. -# -if [ -r /etc/defaults/periodic.conf ] -then - . /etc/defaults/periodic.conf - source_periodic_confs -fi - -case "$weekly_uucp_enable" in - [Yy][Ee][Ss]) - if [ ! -d /var/spool/uucp ] - then - echo '$weekly_uucp_enable is set but /var/spool/uucp' \ - "doesn't exist" - rc=2 - elif [ ! -x /usr/libexec/uucp/clean.weekly ] - then - echo '$weekly_uucp_enable is set but' \ - "/usr/libexec/uucp/clean.weekly isn't executable" - rc=2 - else - echo "" - echo "Cleaning up UUCP:" - - echo /usr/libexec/uucp/clean.weekly | su -m daemon && rc=0 || rc=3 - fi;; - - *) rc=0;; -esac - -exit $rc diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile index 2433e69d9104..964b2e6fddf3 100644 --- a/etc/periodic/weekly/Makefile +++ b/etc/periodic/weekly/Makefile @@ -7,8 +7,5 @@ BIN= 120.clean-kvmdb \ 340.noid \ 400.status-pkg \ 999.local -.if !defined(NOUUCP) -BIN+= 300.uucp -.endif .include