Since OLDCARD is gone from the kernel, catchup here and remove support

from here as well.

3 files changed, 2 insertions, 73 deletions

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 3d3be51..096dc0f 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -26,7 +26,7 @@ FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	network_ipv6 newsyslog nfsclient nfsd \
 	nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
 	othermta \
-	pccard pcvt pf pflog pfsync \
+	pcvt pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \
 	quota \
 	ramdisk ramdisk-own random rarpd resolv root \
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index e76b967..99b5eb8 100644
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl
+# REQUIRE: atm1 ipfilter mountcritlocal serial sppp sysctl
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
deleted file mode 100644
index 67604bd..0000000
--- a/etc/rc.d/pccard
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 1996  The FreeBSD Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: pccard
-# REQUIRE: mountcritlocal
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="pccard"
-start_cmd="pccard_start"
-stop_cmd=":"
-
-pccard_start()
-{
-	if [ ! -c /dev/card0 ]; then
-		exit 0
-	fi
-	if checkyesno pccard_enable; then
-		echo -n 'Setup PC-CARD:'
-
-		case ${pccard_mem} in
-		[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-			pccardc pccardmem 0xd0000 1>/dev/null && echo -n ' memory'
-			;;
-		*)
-			pccardc pccardmem ${pccard_mem} 1>/dev/null && echo -n ' memory'
-			;;
-		esac
-
-		if [ -n "${pccard_beep}" ]; then
-			pccardc beep ${pccard_beep} && echo -n ' beep'
-		fi
-
-		if [ -n "${pccard_conf}" ]; then
-			pccardd_flags="${pccardd_flags} -f ${pccard_conf}"
-		fi
-
-		pccardd ${pccardd_flags} && echo -n ' pccardd'
-		echo '.'
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"