svn commit: r263140 - in head: . contrib/mdocml etc etc/defaults etc/mtree etc/rc.d gnu/usr.bin/groff/tmac include lib lib/libipx release/picobsd/bridge release/picobsd/qemu rescue/rescue sbin/ifco...

Gleb Smirnoff glebius at FreeBSD.org
Fri Mar 14 02:58:59 UTC 2014


Author: glebius
Date: Fri Mar 14 02:58:48 2014
New Revision: 263140
URL: http://svnweb.freebsd.org/changeset/base/263140

Log:
  Remove IPX support.
  
  IPX was a network transport protocol in Novell's NetWare network operating
  system from late 80s and then 90s. The NetWare itself switched to TCP/IP
  as default transport in 1998. Later, in this century the Novell Open
  Enterprise Server became successor of Novell NetWare. The last release
  that claimed to still support IPX was OES 2 in 2007. Routing equipment
  vendors (e.g. Cisco) discontinued support for IPX in 2011.
  
  Thus, IPX won't be supported in FreeBSD 11.0-RELEASE.

Deleted:
  head/etc/rc.d/ipxrouted
  head/lib/libipx/
  head/sbin/ifconfig/af_ipx.c
  head/share/man/man4/ef.4
  head/sys/modules/if_ef/
  head/sys/net/if_ef.c
  head/sys/netipx/
  head/tools/build/options/WITHOUT_IPX
  head/tools/build/options/WITHOUT_IPX_SUPPORT
  head/tools/regression/netipx/
  head/usr.bin/netstat/ipx.c
  head/usr.sbin/IPXrouted/
Modified:
  head/Makefile.inc1
  head/ObsoleteFiles.inc
  head/contrib/mdocml/lib.in
  head/etc/defaults/rc.conf
  head/etc/mtree/BSD.include.dist
  head/etc/network.subr
  head/etc/nsmb.conf
  head/etc/rc.d/Makefile
  head/etc/rc.d/routing
  head/gnu/usr.bin/groff/tmac/fr.ISO8859-1
  head/gnu/usr.bin/groff/tmac/ru.KOI8-R
  head/include/Makefile
  head/lib/Makefile
  head/release/picobsd/bridge/crunch.conf
  head/release/picobsd/qemu/crunch.conf
  head/rescue/rescue/Makefile
  head/sbin/ifconfig/Makefile
  head/sbin/ifconfig/ifconfig.8
  head/sbin/ifconfig/ifconfig.c
  head/sbin/route/route.8
  head/share/man/man4/Makefile
  head/share/man/man4/netgraph.4
  head/share/man/man4/ng_iface.4
  head/share/man/man5/nsmb.conf.5
  head/share/man/man5/rc.conf.5
  head/share/man/man5/src.conf.5
  head/share/man/man7/hier.7
  head/share/man/man9/netisr.9
  head/share/mk/bsd.libnames.mk
  head/share/mk/bsd.own.mk
  head/sys/Makefile
  head/sys/amd64/amd64/machdep.c
  head/sys/conf/NOTES
  head/sys/conf/files
  head/sys/conf/options
  head/sys/i386/i386/machdep.c
  head/sys/kern/Make.tags.inc
  head/sys/kern/kern_jail.c
  head/sys/mips/rmi/rootfs_list.txt
  head/sys/modules/Makefile
  head/sys/modules/arcnet/Makefile
  head/sys/modules/if_tun/Makefile
  head/sys/modules/netgraph/iface/Makefile
  head/sys/modules/smbfs/Makefile
  head/sys/modules/sppp/Makefile
  head/sys/modules/wlan/Makefile
  head/sys/net/if_arcsubr.c
  head/sys/net/if_ethersubr.c
  head/sys/net/if_fddisubr.c
  head/sys/net/if_iso88025subr.c
  head/sys/net/if_loop.c
  head/sys/net/if_spppfr.c
  head/sys/net/if_spppsubr.c
  head/sys/net/if_tun.c
  head/sys/net/if_types.h
  head/sys/net/netisr.h
  head/sys/net/rtsock.c
  head/sys/net80211/ieee80211_ioctl.c
  head/sys/netgraph/ng_cisco.c
  head/sys/netgraph/ng_iface.c
  head/sys/netgraph/ng_iface.h
  head/sys/netgraph/ng_ksocket.c
  head/sys/netinet/in_proto.c
  head/sys/netsmb/netbios.h
  head/sys/pc98/pc98/machdep.c
  head/sys/security/mac_biba/mac_biba.c
  head/sys/security/mac_lomac/mac_lomac.c
  head/sys/sys/param.h
  head/sys/sys/priv.h
  head/tools/bsdbox/Makefile
  head/tools/bsdbox/Makefile.net
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/tools/tools/nanobsd/gateworks/common
  head/usr.bin/kdump/kdump.c
  head/usr.bin/netstat/Makefile
  head/usr.bin/netstat/if.c
  head/usr.bin/netstat/main.c
  head/usr.bin/netstat/netstat.1
  head/usr.bin/netstat/netstat.h
  head/usr.bin/netstat/route.c
  head/usr.sbin/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/Makefile.inc1	Fri Mar 14 02:58:48 2014	(r263140)
@@ -1486,7 +1486,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
-		${_lib_libgssapi} ${_lib_libipx} \
+		${_lib_libgssapi} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
 		${_lib_libcapsicum} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
@@ -1588,10 +1588,6 @@ kerberos5/lib/libheimsqlite__L: lib/libt
 _lib_libgssapi=	lib/libgssapi
 .endif
 
-.if ${MK_IPX} != "no"
-_lib_libipx=	lib/libipx
-.endif
-
 .if ${MK_KERBEROS} != "no"
 _kerberos5_lib=	kerberos5/lib
 _kerberos5_lib_libasn1= kerberos5/lib/libasn1

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/ObsoleteFiles.inc	Fri Mar 14 02:58:48 2014	(r263140)
@@ -38,6 +38,30 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140314: Remove IPX/SPX
+OLD_LIBS+=lib/libipx.so.5
+OLD_FILES+=usr/include/netipx/ipx.h
+OLD_FILES+=usr/include/netipx/ipx_if.h
+OLD_FILES+=usr/include/netipx/ipx_pcb.h
+OLD_FILES+=usr/include/netipx/ipx_var.h
+OLD_FILES+=usr/include/netipx/spx.h
+OLD_FILES+=usr/include/netipx/spx_debug.h
+OLD_FILES+=usr/include/netipx/spx_timer.h
+OLD_FILES+=usr/include/netipx/spx_var.h
+OLD_DIRS+=usr/include/netipx
+OLD_FILES+=usr/lib/libipx.a
+OLD_FILES+=usr/lib/libipx.so
+OLD_FILES+=usr/lib/libipx_p.a
+OLD_FILES+=usr/lib32/libipx.a
+OLD_FILES+=usr/lib32/libipx.so
+OLD_LIBS+=usr/lib32/libipx.so.5
+OLD_FILES+=usr/lib32/libipx_p.a
+OLD_FILES+=usr/sbin/IPXrouted
+OLD_FILES+=usr/share/man/man3/ipx.3.gz
+OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
+OLD_FILES+=usr/share/man/man3/ipx_ntoa.3.gz
+OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz
+
 # 20140223: Remove libyaml
 OLD_FILES+=usr/lib/private/libyaml.a
 OLD_FILES+=usr/lib/private/libyaml.so

Modified: head/contrib/mdocml/lib.in
==============================================================================
--- head/contrib/mdocml/lib.in	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/contrib/mdocml/lib.in	Fri Mar 14 02:58:48 2014	(r263140)
@@ -59,7 +59,6 @@ LINE("libhammer",	"HAMMER Filesystem Use
 LINE("libi386",		"i386 Architecture Library (libi386, \\-li386)")
 LINE("libintl",		"Internationalized Message Handling Library (libintl, \\-lintl)")
 LINE("libipsec",	"IPsec Policy Control Library (libipsec, \\-lipsec)")
-LINE("libipx",		"IPX Address Conversion Support Library (libipx, \\-lipx)")
 LINE("libiscsi",	"iSCSI protocol library (libiscsi, \\-liscsi)")
 LINE("libisns",		"Internet Storage Name Service Library (libisns, \\-lisns)")
 LINE("libjail",		"Jail Library (libjail, \\-ljail)")

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/etc/defaults/rc.conf	Fri Mar 14 02:58:48 2014	(r263140)
@@ -212,7 +212,6 @@ cloned_interfaces=""		# List of cloned n
 #cloned_interfaces="gif0 gif1 gif2 gif3" # Pre-cloning GENERIC config.
 #ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
 #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
-#ifconfig_ed0_ipx="ipx 0x00010010"	# Sample IPX address family entry.
 #ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry
 #ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias
 #ifconfig_fxp0_name="net0"	# Change interface name from fxp0 to net0.
@@ -382,9 +381,6 @@ mrouted_program="/usr/local/sbin/mrouted
 						# install it from package or
 						# port.
 mrouted_flags=""		# Flags for multicast routing daemon.
-ipxgateway_enable="NO"		# Set to YES to enable IPX routing.
-ipxrouted_enable="NO"		# Set to YES to run the IPX routing daemon.
-ipxrouted_flags=""		# Flags for IPX routing daemon.
 arpproxy_all="NO"		# replaces obsolete kernel option ARP_PROXYALL.
 forward_sourceroute="NO"	# do source routing (only if gateway_enable is set to "YES")
 accept_sourceroute="NO"		# accept source routed packets to us

Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/etc/mtree/BSD.include.dist	Fri Mar 14 02:58:48 2014	(r263140)
@@ -275,8 +275,6 @@
     ..
     netipsec
     ..
-    netipx
-    ..
     netnatm
         api
         ..

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/etc/network.subr	Fri Mar 14 02:58:48 2014	(r263140)
@@ -51,7 +51,6 @@ ifn_start()
 	if ! noafif $ifn; then
 		afexists inet && ipv4_up ${ifn} && cfg=0
 		afexists inet6 && ipv6_up ${ifn} && cfg=0
-		afexists ipx && ipx_up ${ifn} && cfg=0
 	fi
 	childif_create ${ifn} && cfg=0
 
@@ -71,7 +70,6 @@ ifn_stop()
 	[ -z "$ifn" ] && err 1 "ifn_stop called without an interface"
 
 	if ! noafif $ifn; then
-		afexists ipx && ipx_down ${ifn} && cfg=0
 		afexists inet6 && ipv6_down ${ifn} && cfg=0
 		afexists inet && ipv4_down ${ifn} && cfg=0
 	fi
@@ -495,9 +493,6 @@ afexists()
 	inet|inet6)
 		check_kern_features ${_af}
 		;;
-	ipx)
-		${SYSCTL_N} net.ipx > /dev/null 2>&1
-		;;
 	atm)
 		if [ -x /sbin/atmconfig ]; then
 			/sbin/atmconfig diag list > /dev/null 2>&1
@@ -1096,7 +1091,6 @@ ifalias_af_common()
 		case $ifconfig_args in
 		inet\ *)	_iaf=inet ;;
 		inet6\ *)	_iaf=inet6 ;;
-		ipx\ *)		_iaf=ipx ;;
 		link\ *)	_iaf=link ;;
 		ether\ *)	_iaf=ether ;;
 		esac
@@ -1146,7 +1140,7 @@ ifalias_af_common()
 	_tmpargs=
 	for _c in `get_if_var $_if ifconfig_IF_aliases` $_aliasn; do
 		case $_c in
-		inet|inet6|ipx|link|ether)
+		inet|inet6|link|ether)
 			case $_tmpargs in
 			${_af}\ *)
 				eval ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0
@@ -1520,55 +1514,6 @@ ng_create_one()
 	done
 }
 
-# ipx_up ifn
-#	Configure any IPX addresses for interface $ifn. Returns 0 if
-#	IPX arguments were found and configured; returns 1 otherwise.
-#
-ipx_up()
-{
-	local ifn
-	ifn="$1"
-
-	# ifconfig_IF_ipx
-	ifconfig_args=`_ifconfig_getargs $ifn ipx`
-	if [ -n "${ifconfig_args}" ]; then
-		${IFCONFIG_CMD} ${ifn} ${ifconfig_args}
-		return 0
-	fi
-
-	return 1
-}
-
-# ipx_down ifn
-#	Remove IPX addresses for interface $ifn. Returns 0 if IPX
-#	addresses were found and unconfigured. It returns 1, otherwise.
-#
-ipx_down()
-{
-	local _if _ifs _ret ipxList oldifs _ipx
-	_if=$1
-	_ifs="^"
-	_ret=1
-	ipxList="`${IFCONFIG_CMD} ${_if} | grep 'ipx ' | tr "\n" "$_ifs"`"
-	oldifs="$IFS"
-
-	IFS="$_ifs"
-	for _ipx in $ipxList ; do
-		# get rid of extraneous line
-		[ -z "$_ipx" ] && break
-
-		_ipx=`expr "$_ipx" : '.*\(ipx [0-9a-h]\{1,8\}H*\.[0-9a-h]\{1,12\}\).*'`
-
-		IFS="$oldifs"
-		${IFCONFIG_CMD} ${_if} ${_ipx} delete
-		IFS="$_ifs"
-		_ret=0
-	done
-	IFS="$oldifs"
-
-	return $_ret
-}
-
 # ifnet_rename [ifname]
 #	Rename interfaces if ifconfig_IF_name is defined.
 #

Modified: head/etc/nsmb.conf
==============================================================================
--- head/etc/nsmb.conf	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/etc/nsmb.conf	Fri Mar 14 02:58:48 2014	(r263140)
@@ -29,7 +29,7 @@
 #
 # keyword/section	A  B  C  D	Comment
 #
-# addr			-  +  -  -	IP or IPX address of SMB server
+# addr			-  +  -  -	IP address of SMB server
 # charsets		+  +  +  +	local:remote charset pair
 # nbns			+  +  -	 -	address of NetBIOS name server (WINS)
 # nbscope		+  +  -	 -	NetBIOS scope

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/etc/rc.d/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -63,7 +63,6 @@ FILES=	DAEMON \
 	ipmon \
 	ipnat \
 	ipsec \
-	${_ipxrouted} \
 	iscsictl \
 	iscsid \
 	jail \
@@ -165,10 +164,6 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
-.if ${MK_IPX} != "no"
-_ipxrouted=	ipxrouted
-.endif
-
 .if ${MK_OFED} != "no"
 _opensm=	opensm
 .endif

Modified: head/etc/rc.d/routing
==============================================================================
--- head/etc/rc.d/routing	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/etc/rc.d/routing	Fri Mar 14 02:58:48 2014	(r263140)
@@ -33,7 +33,7 @@ routing_start()
 	esac
 
 	case $_af in
-	inet|inet6|ipx|atm)
+	inet|inet6|atm)
 		if afexists $_af; then
 			setroutes $_cmd $_af $_if
 		else
@@ -41,7 +41,7 @@ routing_start()
 		fi
 		;;
 	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
-		for _a in inet inet6 ipx atm; do
+		for _a in inet inet6 atm; do
 			afexists $_a && setroutes $_cmd $_a $_if
 		done
 		;;
@@ -62,7 +62,7 @@ routing_stop()
 	esac
 
 	case $_af in
-	inet|inet6|ipx|atm)
+	inet|inet6|atm)
 		if afexists $_af; then
 			eval static_${_af} delete $_if 
 			# When $_if is specified, do not flush routes.
@@ -74,7 +74,7 @@ routing_stop()
 		fi
 		;;
 	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
-		for _a in inet inet6 ipx atm; do
+		for _a in inet inet6 atm; do
 			afexists $_a || continue
 			eval static_${_a} delete $_if
 			# When $_if is specified, do not flush routes.
@@ -127,11 +127,6 @@ routing_stop_atm()
 	return 0
 }
 
-routing_stop_ipx()
-{
-	return 0
-}
-
 static_inet()
 {
 	local _action _if _skip
@@ -290,11 +285,6 @@ static_atm()
 	fi
 }
 
-static_ipx()
-{
-	:
-}
-
 ropts_init()
 {
 	if [ -z "${_ropts_initdone}" ]; then
@@ -387,20 +377,5 @@ options_atm()
 	[ -n "${_ropts_initdone}" ] && echo '.'
 }
 
-options_ipx()
-{
-	_ropts_initdone=
-
-	if checkyesno ipxgateway_enable; then
-		ropts_init ipx
-		echo -n ' gateway=YES'
-		${SYSCTL} net.ipx.ipx.ipxforwarding=1 > /dev/null
-	else
-		${SYSCTL} net.ipx.ipx.ipxforwarding=0 > /dev/null
-	fi
-
-	[ -n "${_ropts_initdone}" ] && echo '.'
-}
-
 load_rc_config $name
 run_rc_command "$@"

Modified: head/gnu/usr.bin/groff/tmac/fr.ISO8859-1
==============================================================================
--- head/gnu/usr.bin/groff/tmac/fr.ISO8859-1	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/gnu/usr.bin/groff/tmac/fr.ISO8859-1	Fri Mar 14 02:58:48 2014	(r263140)
@@ -86,7 +86,6 @@
 .\" XXX ds doc-str-Lb-libgeom     Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
 .ds doc-str-Lb-libi386     Bibliothèque de l'architecture i386 (libi386, \-li386)
 .ds doc-str-Lb-libipsec    Bibliothèque de contrôle de politique IPsec (libipsec, \-lipsec)
-.ds doc-str-Lb-libipx      Bibliothèque de support des conversions des adresses IPX (libipx, \-lipx)
 .ds doc-str-Lb-libkvm      Bibliothèque d'accès aux données du noyau (libkvm, \-lkvm)
 .ds doc-str-Lb-libm        Bibliothèque mathématique (libm, \-lm)
 .ds doc-str-Lb-libmd       Bibliothèque de support des signatures (MD4, MD5, etc.) (libmd, \-lmd)

Modified: head/gnu/usr.bin/groff/tmac/ru.KOI8-R
==============================================================================
--- head/gnu/usr.bin/groff/tmac/ru.KOI8-R	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/gnu/usr.bin/groff/tmac/ru.KOI8-R	Fri Mar 14 02:58:48 2014	(r263140)
@@ -86,7 +86,6 @@
 .ds doc-str-Lb-libgeom     ðÏÌØÚÏ×ÁÔÅÌØÓËÁÑ API ÂÉÂÌÉÏÔÅËÁ ÐÏÄÓÉÓÔÅÍÙ ÑÄÒÁ GEOM (libgeom, \-lgeom)
 .ds doc-str-Lb-libi386     âÉÂÌÉÏÔÅËÁ ÁÒÈÉÔÅËÔÕÒÙ i386 (libi386, \-li386)
 .ds doc-str-Lb-libipsec    âÉÂÌÉÏÔÅËÁ ÕÐÒÁ×ÌÅÎÉÑ IPsec Policy (libipsec, \-lipsec)
-.ds doc-str-Lb-libipx      âÉÂÌÉÏÔÅËÁ ÐÏÄÄÅÒÖËÉ ËÏÎ×ÅÒÓÉÉ ÁÄÒÅÓÏ× IPX (libipx, \-lipx)
 .ds doc-str-Lb-libkvm      âÉÂÌÉÏÔÅËÁ ÄÏÓÔÕÐÁ Ë ÄÁÎÎÙÍ ÑÄÒÁ (libkvm, \-lkvm)
 .ds doc-str-Lb-libm        âÉÂÌÉÏÔÅËÁ ÍÁÔÅÍÁÔÉÞÅÓËÉÈ ÆÕÎËÃÉÊ (libm, \-lm)
 .\" XXX ds doc-str-Lb-libmd       Message Digest (MD4, MD5, É Ô.Ä.) Support Library (libmd, \-lmd)

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/include/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -37,9 +37,7 @@ LHDRS=	aio.h errno.h fcntl.h linker_set.
 	syslog.h ucontext.h
 
 LDIRS=	bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
-	netipsec ${_netipx} netnatm netsmb \
-	nfs nfsclient nfsserver \
-	sys vm
+	netipsec netnatm netsmb nfs nfsclient nfsserver sys vm
 
 LSUBDIRS=	cam/ata cam/scsi \
 	dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \
@@ -76,11 +74,6 @@ INCS+=	hesiod.h
 LSUBSUBDIRS+=	netgraph/bluetooth/include
 .endif
 
-# XXX unconditionally needed by <netsmb/netbios.h>
-#.if ${MK_IPX} != "no"
-_netipx=	netipx
-#.endif
-
 # Handle the #define aliases for libiconv
 .if ${MK_ICONV} == "yes"
 INCS+=		iconv.h

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/lib/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -88,7 +88,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libgssapi} \
 	${_librpcsec_gss} \
 	libipsec \
-	${_libipx} \
 	libjail \
 	libkiconv \
 	liblzma \
@@ -183,10 +182,6 @@ _librpcsec_gss=	librpcsec_gss
 _libiconv_modules=	libiconv_modules
 .endif
 
-.if ${MK_IPX} != "no"
-_libipx=	libipx
-.endif
-
 .if ${MK_LDNS} != "no"
 _libldns=	libldns
 .endif

Modified: head/release/picobsd/bridge/crunch.conf
==============================================================================
--- head/release/picobsd/bridge/crunch.conf	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/release/picobsd/bridge/crunch.conf	Fri Mar 14 02:58:48 2014	(r263140)
@@ -31,7 +31,6 @@
 
 buildopts -DWITHOUT_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH
 buildopts -DTRACEROUTE_NO_IPSEC -DNO_INET6
-buildopts -DWITHOUT_IPX
 
 # Directories where to look for sources of various binaries.
 # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf)

Modified: head/release/picobsd/qemu/crunch.conf
==============================================================================
--- head/release/picobsd/qemu/crunch.conf	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/release/picobsd/qemu/crunch.conf	Fri Mar 14 02:58:48 2014	(r263140)
@@ -31,7 +31,6 @@
 
 buildopts -DWITHOUT_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH
 buildopts -DTRACEROUTE_NO_IPSEC -DNO_INET6
-buildopts -DWITHOUT_IPX
 
 # Directories where to look for sources of various binaries.
 # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf)

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/rescue/rescue/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -119,9 +119,6 @@ CRUNCH_PROGS_sbin+= zpool
 # CRUNCH_PROGS+= devd
 
 CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
-.if ${MK_IPX} != "no"
-CRUNCH_LIBS+= -lipx
-.endif
 .if ${MK_ZFS} != "no"
 CRUNCH_LIBS+= -lavl -ljail -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
 .endif

Modified: head/sbin/ifconfig/Makefile
==============================================================================
--- head/sbin/ifconfig/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sbin/ifconfig/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -53,11 +53,6 @@ CFLAGS+= -DINET6
 .if ${MK_INET_SUPPORT} != "no"
 CFLAGS+= -DINET
 .endif
-.if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH)
-SRCS+=	af_ipx.c		# IPX support
-DPADD+=	${LIBIPX}
-LDADD+=	-lipx
-.endif
 .if ${MK_JAIL} != "no" && !defined(RELEASE_CRUNCH) && !defined(RESCUE)
 CFLAGS+= -DJAIL
 DPADD+= ${LIBJAIL}

Modified: head/sbin/ifconfig/ifconfig.8
==============================================================================
--- head/sbin/ifconfig/ifconfig.8	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sbin/ifconfig/ifconfig.8	Fri Mar 14 02:58:48 2014	(r263140)
@@ -159,12 +159,8 @@ supported are
 .Dq inet ,
 .Dq inet6 ,
 .Dq atalk ,
-.Dq ipx ,
-.\" .Dq iso ,
 and
 .Dq link .
-.\" and
-.\" .Dq ns .
 The default if available is
 .Dq inet
 or otherwise
@@ -309,12 +305,6 @@ using the
 kernel configuration option, or the
 .Va net.fibs
 tunable.
-.It Cm ipdst
-This is used to specify an Internet host who is willing to receive
-IP packets encapsulating IPX packets bound for a remote network.
-An apparent point to point link is constructed, and
-the address specified will be taken as the IPX address and network
-of the destination.
 .It Cm maclabel Ar label
 If Mandatory Access Control support is enabled in the kernel,
 set the MAC label to

Modified: head/sbin/ifconfig/ifconfig.c
==============================================================================
--- head/sbin/ifconfig/ifconfig.c	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sbin/ifconfig/ifconfig.c	Fri Mar 14 02:58:48 2014	(r263140)
@@ -741,20 +741,6 @@ setifbroadaddr(const char *addr, int dum
 }
 
 static void
-setifipdst(const char *addr, int dummy __unused, int s,
-    const struct afswtch *afp)
-{
-	const struct afswtch *inet;
-
-	inet = af_getbyname("inet");
-	if (inet == NULL)
-		return;
-	inet->af_getaddr(addr, DSTADDR);
-	clearaddr = 0;
-	newaddr = 0;
-}
-
-static void
 notealias(const char *addr, int param, int s, const struct afswtch *afp)
 {
 #define rqtosa(x) (&(((struct ifreq *)(afp->x))->ifr_addr))
@@ -1176,7 +1162,6 @@ static struct cmd basic_cmds[] = {
 	DEF_CMD_ARG("netmask",			setifnetmask),
 	DEF_CMD_ARG("metric",			setifmetric),
 	DEF_CMD_ARG("broadcast",		setifbroadaddr),
-	DEF_CMD_ARG("ipdst",			setifipdst),
 	DEF_CMD_ARG2("tunnel",			settunnel),
 	DEF_CMD("-tunnel", 0,			deletetunnel),
 	DEF_CMD("deletetunnel", 0,		deletetunnel),

Modified: head/sbin/route/route.8
==============================================================================
--- head/sbin/route/route.8	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sbin/route/route.8	Fri Mar 14 02:58:48 2014	(r263140)
@@ -487,7 +487,6 @@ The next-hop gateway should be reachable
 .Xr netintro 4 ,
 .Xr route 4 ,
 .Xr arp 8 ,
-.Xr IPXrouted 8 ,
 .Xr routed 8
 .\".Xr XNSrouted 8
 .Sh HISTORY

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man4/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -122,7 +122,6 @@ MAN=	aac.4 \
 	dummynet.4 \
 	ed.4 \
 	edsc.4 \
-	ef.4 \
 	ehci.4 \
 	em.4 \
 	en.4 \

Modified: head/share/man/man4/netgraph.4
==============================================================================
--- head/share/man/man4/netgraph.4	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man4/netgraph.4	Fri Mar 14 02:58:48 2014	(r263140)
@@ -1270,7 +1270,7 @@ sending frames out of the interface.
 .It INTERFACE
 This node is also a system networking interface.
 It has hooks representing
-each protocol family (IP, AppleTalk, IPX, etc.) and appears in the output of
+each protocol family (IP, AppleTalk, etc.) and appears in the output of
 .Xr ifconfig 8 .
 The interfaces are named
 .Dq Li ng0 ,

Modified: head/share/man/man4/ng_iface.4
==============================================================================
--- head/share/man/man4/ng_iface.4	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man4/ng_iface.4	Fri Mar 14 02:58:48 2014	(r263140)
@@ -70,7 +70,7 @@ Packets transmitted via the interface fl
 protocol-specific hook.
 Similarly, packets received on a hook appear on the interface as
 packets received into the corresponding protocol stack.
-The currently supported protocols are IP, IPv6, AppleTalk, IPX, ATM,
+The currently supported protocols are IP, IPv6, AppleTalk, ATM,
 NATM, and NS.
 .Pp
 An
@@ -90,8 +90,6 @@ Transmission and reception of IP packets
 Transmission and reception of IPv6 packets.
 .It Va atalk
 Transmission and reception of AppleTalk packets.
-.It Va ipx
-Transmission and reception of IPX packets.
 .It Va atm
 Transmission and reception of ATM packets.
 .It Va natm

Modified: head/share/man/man5/nsmb.conf.5
==============================================================================
--- head/share/man/man5/nsmb.conf.5	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man5/nsmb.conf.5	Fri Mar 14 02:58:48 2014	(r263140)
@@ -82,7 +82,7 @@ Possible keywords may include:
 .Bl -column ".Va retry_count" ".Sy Section"
 .It Sy "Keyword	Section	Comment"
 .It Sy "	A B C D"
-.It Va addr        Ta "- + - -" Ta "IP or IPX address of SMB server"
+.It Va addr        Ta "- + - -" Ta "IP address of SMB server"
 .It Va charsets    Ta "- + + +" Ta "local:remote charset pair"
 .It Va nbns        Ta "+ + - -" Ta "address of NetBIOS name server (WINS)"
 .It Va nbscope     Ta "+ + - -" Ta "NetBIOS scope"
@@ -141,13 +141,6 @@ used on a password:
 .Bd -literal -offset indent
 smbutil crypt
 .Ed
-.Sh COMPATIBILITY
-At the time of this writing, the
-.Tn IPX
-protocol remains unsupported.
-Future
-.Fx
-releases are expected to support this.
 .Sh SEE ALSO
 .Xr smbutil 1 ,
 .Xr mount_smbfs 8

Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man5/rc.conf.5	Fri Mar 14 02:58:48 2014	(r263140)
@@ -2845,27 +2845,6 @@ If
 is set to
 .Dq Li YES
 this is the list of interfaces to use.
-.It Va ipxgateway_enable
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-enable the routing of IPX traffic.
-.It Va ipxrouted_enable
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-run the
-.Xr IPXrouted 8
-daemon at system boot time.
-.It Va ipxrouted_flags
-.Pq Vt str
-If
-.Va ipxrouted_enable
-is set to
-.Dq Li YES ,
-these are the flags to pass to the
-.Xr IPXrouted 8
-daemon.
 .It Va arpproxy_all
 .Pq Vt bool
 If set to

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man5/src.conf.5	Fri Mar 14 02:58:48 2014	(r263140)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd February 22, 2014
+.Dd March 5, 2014
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -448,10 +448,6 @@ Set to not build GPIB bus support.
 Set to not build
 .Xr gpioctl 8
 as part of the base system.
-.It Va WITH_GPL_DTC
-.\" from FreeBSD: head/tools/build/options/WITH_GPL_DTC 246262 2013-02-02 22:42:46Z dim
-Set to build the GPL'd version of the device tree compiler from elinux.org,
-instead of the BSD licensed one.
 .It Va WITHOUT_GROFF
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GROFF 218941 2011-02-22 08:13:49Z uqs
 Set to not build
@@ -524,18 +520,6 @@ Set to not build IP Filter package.
 .It Va WITHOUT_IPFW
 .\" from FreeBSD: head/tools/build/options/WITHOUT_IPFW 183242 2008-09-21 22:02:26Z sam
 Set to not build IPFW tools.
-.It Va WITHOUT_IPX
-.\" from FreeBSD: head/tools/build/options/WITHOUT_IPX 156932 2006-03-21 07:50:50Z ru
-Set to not build programs and libraries related to IPX networking.
-When set, it also enforces the following options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_IPX_SUPPORT
-.El
-.It Va WITHOUT_IPX_SUPPORT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_IPX_SUPPORT 156932 2006-03-21 07:50:50Z ru
-Set to build some programs without IPX support.
 .It Va WITHOUT_JAIL
 .\" from FreeBSD: head/tools/build/options/WITHOUT_JAIL 249966 2013-04-27 04:09:09Z eadler
 Set to not build tools for the support of jails; e.g.,

Modified: head/share/man/man7/hier.7
==============================================================================
--- head/share/man/man7/hier.7	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man7/hier.7	Fri Mar 14 02:58:48 2014	(r263140)
@@ -297,8 +297,6 @@ see
 kernel key-management service;
 see
 .Xr ipsec 4
-.It Pa netipx/
-IPX/SPX protocol stacks
 .It Pa netnatm/
 NATM include files;
 see

Modified: head/share/man/man9/netisr.9
==============================================================================
--- head/share/man/man9/netisr.9	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/man/man9/netisr.9	Fri Mar 14 02:58:48 2014	(r263140)
@@ -204,8 +204,6 @@ Appletalk phase 1
 Appletalk phase 2
 .It Dv NETISR_ARP
 ARP
-.It Dv NETISR_IPX
-IPX/SPX
 .It Dv NETISR_IPV6
 IPv6
 .It Dv NETISR_NATM

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/mk/bsd.libnames.mk	Fri Mar 14 02:58:48 2014	(r263140)
@@ -67,9 +67,6 @@ LIBHEIMNTLM?=	${DESTDIR}${LIBDIR}/libhei
 LIBHEIMSQLITE?=	${DESTDIR}${LIBDIR}/libheimsqlite.a
 LIBHX509?=	${DESTDIR}${LIBDIR}/libhx509.a
 LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
-.if ${MK_IPX} != "no"
-LIBIPX?=	${DESTDIR}${LIBDIR}/libipx.a
-.endif
 LIBJAIL?=	${DESTDIR}${LIBDIR}/libjail.a
 LIBKADM5CLNT?=	${DESTDIR}${LIBDIR}/libkadm5clnt.a
 LIBKADM5SRV?=	${DESTDIR}${LIBDIR}/libkadm5srv.a

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/share/mk/bsd.own.mk	Fri Mar 14 02:58:48 2014	(r263140)
@@ -297,7 +297,6 @@ __DEFAULT_YES_OPTIONS = \
     INSTALLLIB \
     IPFILTER \
     IPFW \
-    IPX \
     JAIL \
     KDUMP \
     KERBEROS \
@@ -572,7 +571,6 @@ MK_TESTS:= no
     GNU \
     INET \
     INET6 \
-    IPX \
     KERBEROS \
     KVM \
     NETGRAPH \

Modified: head/sys/Makefile
==============================================================================
--- head/sys/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -10,7 +10,7 @@ SUBDIR=	boot
 # Directories to include in cscope name file and TAGS.
 CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 netatalk \
-		netgraph netinet netinet6 netipsec netipx netnatm netpfil \
+		netgraph netinet netinet6 netipsec netnatm netpfil \
 		netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
 		pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
 .if !defined(CSCOPE_ARCHDIR)

Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/amd64/amd64/machdep.c	Fri Mar 14 02:58:48 2014	(r263140)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
-#include "opt_ipx.h"
 #include "opt_isa.h"
 #include "opt_kstack_pages.h"
 #include "opt_maxmem.h"

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/conf/NOTES	Fri Mar 14 02:58:48 2014	(r263140)
@@ -606,8 +606,6 @@ options 	IPSEC			#IP security (requires 
 #
 options		IPSEC_NAT_T		#NAT-T support, UDP encap of ESP
 
-options 	IPX			#IPX/SPX communications protocols
-
 options 	NETATALK		#Appletalk communications protocols
 options 	NETATALKDEBUG		#Appletalk debugging
 
@@ -886,14 +884,6 @@ options 	XBONEHACK
 device		faith
 device		stf
 
-#  The `ef' device provides support for multiple ethernet frame types
-#  specified via ETHER_* options. See ef(4) for details.
-device		ef
-options 	ETHER_II		# enable Ethernet_II frame
-options 	ETHER_8023		# enable Ethernet_802.3 (Novell) frame
-options 	ETHER_8022		# enable Ethernet_802.2 frame
-options 	ETHER_SNAP		# enable Ethernet_802.2/SNAP frame
-
 # The pf packet filter consists of three devices:
 #  The `pf' device provides /dev/pf and the firewall code itself.
 #  The `pflog' device provides the pflog0 interface which logs packets.

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/conf/files	Fri Mar 14 02:58:48 2014	(r263140)
@@ -3087,7 +3087,6 @@ net/if_dead.c			standard
 net/if_debug.c			optional ddb
 net/if_disc.c			optional disc
 net/if_edsc.c			optional edsc
-net/if_ef.c			optional ef
 net/if_enc.c			optional enc ipsec inet | enc ipsec inet6
 net/if_epair.c			optional epair
 net/if_ethersubr.c		optional ether
@@ -3365,16 +3364,6 @@ netipsec/xform_ipcomp.c		optional ipsec 
 netipsec/xform_ipip.c		optional ipsec inet | ipsec inet6
 netipsec/xform_tcp.c		optional ipsec inet tcp_signature | \
 					 ipsec inet6 tcp_signature
-netipx/ipx.c			optional ipx
-netipx/ipx_cksum.c		optional ipx
-netipx/ipx_input.c		optional ipx
-netipx/ipx_outputfl.c		optional ipx
-netipx/ipx_pcb.c		optional ipx
-netipx/ipx_proto.c		optional ipx
-netipx/ipx_usrreq.c		optional ipx
-netipx/spx_debug.c		optional ipx
-netipx/spx_reass.c		optional ipx
-netipx/spx_usrreq.c		optional ipx
 netnatm/natm.c			optional natm
 netnatm/natm_pcb.c		optional natm
 netnatm/natm_proto.c		optional natm

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/conf/options	Fri Mar 14 02:58:48 2014	(r263140)
@@ -398,10 +398,6 @@ DEV_PFLOG		opt_pf.h
 DEV_PFSYNC		opt_pf.h
 DEV_VLAN		opt_vlan.h
 DUMMYNET		opt_ipdn.h
-ETHER_8022		opt_ef.h
-ETHER_8023		opt_ef.h
-ETHER_II		opt_ef.h
-ETHER_SNAP		opt_ef.h
 INET			opt_inet.h
 INET6			opt_inet6.h
 IPDIVERT
@@ -419,7 +415,6 @@ IPSEC_DEBUG		opt_ipsec.h
 IPSEC_FILTERTUNNEL	opt_ipsec.h
 IPSEC_NAT_T		opt_ipsec.h
 IPSTEALTH
-IPX
 KRPC
 LIBALIAS
 LIBMBPOOL

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/i386/i386/machdep.c	Fri Mar 14 02:58:48 2014	(r263140)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
-#include "opt_ipx.h"
 #include "opt_isa.h"
 #include "opt_kstack_pages.h"
 #include "opt_maxmem.h"

Modified: head/sys/kern/Make.tags.inc
==============================================================================
--- head/sys/kern/Make.tags.inc	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/kern/Make.tags.inc	Fri Mar 14 02:58:48 2014	(r263140)
@@ -40,7 +40,6 @@ COMM=	${SYS}/dev/advansys/*.[ch] \
 	${SYS}/netinet/*.[ch] \
 	${SYS}/netinet6/*.[ch] \
 	${SYS}/netipsec/*.[ch] \
-	${SYS}/netipx/*.[ch] \
 	${SYS}/netnatm/*.[ch] \
 	${SYS}/nfs/*.[ch] \
 	${SYS}/nfsclient/*.[ch] \
@@ -59,7 +58,6 @@ COMMDIR1= ${SYS}/conf \
 	${SYS}/netinet \
 	${SYS}/netinet6 \
 	${SYS}/netipsec \
-	${SYS}/netipx \
 	${SYS}/netnatm \
 	${SYS}/nfs \
 	${SYS}/pci \

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/kern/kern_jail.c	Fri Mar 14 02:58:48 2014	(r263140)
@@ -3744,12 +3744,6 @@ prison_priv_check(struct ucred *cred, in
 
 #ifdef notyet
 		/*
-		 * IPX/SPX privileges.
-		 */
-	case PRIV_NETIPX_RESERVEDPORT:
-	case PRIV_NETIPX_RAW:
-
-		/*
 		 * NCP privileges.
 		 */
 	case PRIV_NETNCP:

Modified: head/sys/mips/rmi/rootfs_list.txt
==============================================================================
--- head/sys/mips/rmi/rootfs_list.txt	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/mips/rmi/rootfs_list.txt	Fri Mar 14 02:58:48 2014	(r263140)
@@ -222,7 +222,6 @@
 ./etc/rc.d/ipmon
 ./etc/rc.d/ipnat
 ./etc/rc.d/ipsec
-./etc/rc.d/ipxrouted
 ./etc/rc.d/jail
 ./etc/rc.d/kadmind
 ./etc/rc.d/kerberos
@@ -437,7 +436,6 @@
 ./lib/libbsdxml.so.4
 ./lib/libgeom.so.5
 ./lib/libipsec.so.4
-./lib/libipx.so.5
 ./lib/libjail.so.1
 ./lib/libkiconv.so.4
 ./lib/libpcap.so.7

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/modules/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -136,7 +136,6 @@ SUBDIR=	\
 	if_bridge \
 	if_disc \
 	if_edsc \
-	if_ef \
 	if_epair \
 	if_faith \
 	if_gif \

Modified: head/sys/modules/arcnet/Makefile
==============================================================================
--- head/sys/modules/arcnet/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/modules/arcnet/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -4,7 +4,7 @@
 
 KMOD=	arcnet
 SRCS=	if_arcsubr.c
-SRCS+=	opt_inet.h opt_inet6.h opt_ipx.h opt_ofed.h
+SRCS+=	opt_inet.h opt_inet6.h opt_ofed.h
 
 EXPORT_SYMS=	arc_frag_init	\
 		arc_frag_next	\
@@ -22,9 +22,6 @@ opt_inet.h:
 
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
-
-opt_ipx.h:
-	echo "#define IPX 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/if_tun/Makefile
==============================================================================
--- head/sys/modules/if_tun/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/modules/if_tun/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_tun
-SRCS=	if_tun.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h
+SRCS=	if_tun.c opt_atalk.h opt_inet.h opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
 opt_atalk.h:
@@ -14,9 +14,6 @@ opt_inet.h:
 
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
-
-opt_ipx.h:
-	echo "#define IPX 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/netgraph/iface/Makefile
==============================================================================
--- head/sys/modules/netgraph/iface/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/modules/netgraph/iface/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -2,7 +2,7 @@
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_iface
-SRCS= 	ng_iface.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h
+SRCS= 	ng_iface.c opt_atalk.h opt_inet.h opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
 opt_atalk.h:
@@ -13,9 +13,6 @@ opt_inet.h:
 
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
-
-opt_ipx.h:
-	echo "#define IPX 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/smbfs/Makefile
==============================================================================
--- head/sys/modules/smbfs/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/modules/smbfs/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -10,8 +10,7 @@
 KMOD=	smbfs
 
 SRCS=	vnode_if.h \
-	opt_inet.h opt_ipx.h \
-	opt_netsmb.h \
+	opt_inet.h opt_netsmb.h \
 	iconv_converter_if.h \
 	md4c.c \
 	smb_conn.c smb_dev.c smb_trantcp.c smb_smb.c smb_subr.c smb_rq.c \
@@ -27,9 +26,6 @@ SRCS+=	des_enc.S
 SRCS+=	des_enc.c
 .endif
 
-# Build with IPX support (1|0)
-SMB_IPX?=	0
-
 # Build with INET support (1|0)
 SMB_INET?=	1
 
@@ -44,11 +40,6 @@ CFLAGS+= -DVNPRINT
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 .endif
-
-.if ${SMB_IPX} > 0
-opt_ipx.h:
-	echo "#define IPX 1" > ${.TARGET}
-.endif
 .endif
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/sppp/Makefile
==============================================================================
--- head/sys/modules/sppp/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/modules/sppp/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -4,7 +4,7 @@
 
 KMOD=	sppp
 SRCS=	if_spppfr.c if_spppsubr.c slcompress.c
-SRCS+=	opt_inet.h opt_inet6.h opt_ipx.h
+SRCS+=	opt_inet.h opt_inet6.h
 
 EXPORT_SYMS=	sppp_attach	\
 		sppp_detach	\
@@ -21,9 +21,6 @@ opt_inet.h:
 
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
-
-opt_ipx.h:
-	echo "#define IPX 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/wlan/Makefile
==============================================================================
--- head/sys/modules/wlan/Makefile	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/modules/wlan/Makefile	Fri Mar 14 02:58:48 2014	(r263140)
@@ -13,7 +13,7 @@ SRCS=	ieee80211.c ieee80211_action.c iee
 	ieee80211_ht.c ieee80211_hwmp.c ieee80211_adhoc.c ieee80211_hostap.c \
 	ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c \
 	ieee80211_tdma.c ieee80211_superg.c
-SRCS+=	bus_if.h device_if.h opt_ddb.h opt_inet.h opt_inet6.h opt_ipx.h \
+SRCS+=	bus_if.h device_if.h opt_ddb.h opt_inet.h opt_inet6.h \
 	opt_tdma.h opt_wlan.h
 
 .if !defined(KERNBUILDDIR)
@@ -23,8 +23,6 @@ opt_wlan.h:
 	echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET}
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
-opt_ipx.h:
-	echo "#define IPX 1" > ${.TARGET}
 # override to get ddb support?
 opt_ddb.h:
 	:> ${.TARGET}

Modified: head/sys/net/if_arcsubr.c
==============================================================================
--- head/sys/net/if_arcsubr.c	Fri Mar 14 02:56:49 2014	(r263139)
+++ head/sys/net/if_arcsubr.c	Fri Mar 14 02:58:48 2014	(r263140)
@@ -40,7 +40,6 @@
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_ipx.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,11 +76,6 @@
 #include <netinet6/nd6.h>
 #endif
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-head mailing list