Extend coverage of the MK_IPX build option to the following:

- <netipx> headers [1]
- IPX library (libipx)
- IPX support in ifconfig(8)
- IPXrouted(8)
- new MK_NCP option

New MK_NCP build option controls:

- <netncp> and <fs/nwfs> headers
- NCP library (libncp)
- ncplist(1) and ncplogin(1)
- mount_nwfs(8)
- ncp and nwfs kernel modules

User knobs: WITHOUT_IPX, WITHOUT_IPX_SUPPORT, WITHOUT_NCP.

[1] <netsmb/netbios.h> unconditionally uses <netipx> headers
so they are still installed.  This needs to be dealt with.

Makefile.inc1

@@ -963,6 +963,10 @@ _prebuild_libs=
 
 _generic_libs=	gnu/lib
 
+.if ${MK_IPX} != "no"
+_prebuild_libs+= lib/libipx
+.endif
+
 .if ${MK_KERBEROS} != "no"
 _prebuild_libs+=	kerberos5/lib/libasn1
 _prebuild_libs+=	kerberos5/lib/libkrb5
@@ -971,7 +975,7 @@ _generic_libs+=	kerberos5/lib
 .endif
 
 _prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
-		lib/libipx lib/libkiconv lib/libkvm lib/libmd \
+		lib/libkiconv lib/libkvm lib/libmd \
 		lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
 		lib/libradius \
 		lib/libsbuf lib/libtacplus lib/libutil \

include/Makefile

@@ -34,7 +34,8 @@ LHDRS=	aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
 	termios.h ucontext.h
 
 LDIRS=	bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \
-	netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \
+	netipsec ${_netipx} netkey netnatm ${_netncp} netsmb \
+	nfs nfsclient nfsserver \
 	pccard posix4 sys vm
 
 LSUBDIRS=	cam/scsi \
@@ -42,7 +43,7 @@ LSUBDIRS=	cam/scsi \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
 	dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
-	fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
+	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
 	fs/unionfs \
 	geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \
 	geom/raid3 geom/shsec geom/stripe \
@@ -66,6 +67,16 @@ INCS+=	hesiod.h
 LSUBSUBDIRS=	netgraph/bluetooth/include
 .endif
 
+# XXX unconditionally needed by <netsmb/netbios.h>
+#.if ${MK_IPX} != "no"
+_netipx=	netipx
+#.endif
+
+.if ${MK_NCP} != "no"
+_netncp=	netncp
+_fs_nwfs=	fs/nwfs
+.endif
+
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies'').  ``symlinks'' is
 # probably only useful for developers and should be avoided if you do not

lib/Makefile

@@ -31,7 +31,7 @@ SUBDIR=	${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
 	libgssapi ${_libio} libipsec \
-	libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \
+	${_libipx} libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpanel libpcap \
 	libpmc ${_libpthread} librt ${_libsdp} ${_libsm} ${_libsmb} \
 	${_libsmdb} \
@@ -60,8 +60,14 @@ _libbluetooth=	libbluetooth
 _libsdp=	libsdp
 .endif
 
+.if ${MK_IPX} != "no"
+_libipx=	libipx
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
+.if ${MK_NCP} != "no"
 _libncp=	libncp
+.endif
 _libsmb=	libsmb
 _libvgl=	libvgl
 .endif
@@ -87,7 +93,9 @@ _libmp=		libmp
 .endif
 
 .if ${MACHINE_ARCH} == "amd64"
+.if ${MK_NCP} != "no"
 _libncp=	libncp
+.endif
 _libsmb=	libsmb
 .endif
 

release/picobsd/bridge/crunch.conf

@@ -19,6 +19,7 @@
 # that to use the most compact possible version of the code.
 #
 buildopts -DNO_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH -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)
@@ -179,6 +180,6 @@ libs -ll       # used by sh
 libs -lufs     # used by mount
 ### ee uses ncurses instead of curses
 libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm
-libs -lmytinfo -lipx -lz -lpcap -lwrap
+libs -lmytinfo -lz -lpcap -lwrap
 libs -ltermcap -lgnuregex # -lcurses
 libs -lgeom

rescue/rescue/Makefile

@@ -134,14 +134,21 @@ CRUNCH_PROGS_sbin+= ipf
 # crunchgen does not like C++ programs; this should be fixed someday
 # CRUNCH_PROGS+= devd
 
-CRUNCH_LIBS+= -lalias -lbsdxml -lcam -lcurses -ldevstat -lipsec -lipx \
-	-lgeom -lkiconv -lmd -lreadline -lsbuf -lufs -lz 
+CRUNCH_LIBS+= -lalias -lbsdxml -lcam -lcurses -ldevstat -lipsec
+.if ${MK_IPX} != "no"
+CRUNCH_LIBS+= -lipx
+.endif
+CRUNCH_LIBS+= -lgeom -lkiconv -lmd -lreadline -lsbuf -lufs -lz
 
 .if ${MACHINE_ARCH} == "i386"
 CRUNCH_PROGS_sbin+= sconfig fdisk
 CRUNCH_ALIAS_bsdlabel= disklabel
-#CRUNCH_PROGS+= mount_nwfs mount_smbfs
-#CRUNCH_LIBS+= -lncp -lsmb
+#.if ${MK_NCP} != "no"
+#CRUNCH_PROGS+= mount_nwfs
+#CRUNCH_LIBS+= -lncp
+#.endif
+#CRUNCH_PROGS+= mount_smbfs
+#CRUNCH_LIBS+= -lsmb
 .endif
 
 .if ${MACHINE} == "pc98"

sbin/ifconfig/Makefile

@@ -1,6 +1,8 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ifconfig
 
 SRCS=	ifconfig.c		# base support
@@ -28,7 +30,7 @@ SRCS+=	ifpfsync.c		# pfsync(4) support
 
 SRCS+=	ifbridge.c		# bridge support
 
-.if !defined(RELEASE_CRUNCH)
+.if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH)
 SRCS+=	af_ipx.c		# IPX support
 DPADD=	${LIBIPX}
 LDADD=	-lipx

share/mk/bsd.libnames.mk

@@ -53,7 +53,9 @@ LIBGSSAPI?=	${DESTDIR}${LIBDIR}/libgssapi.a
 LIBHDB?=	${DESTDIR}${LIBDIR}/libhdb.a
 LIBHISTORY?=	${DESTDIR}${LIBDIR}/libhistory.a
 LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
+.if ${MK_IPX} != "no"
 LIBIPX?=	${DESTDIR}${LIBDIR}/libipx.a
+.endif
 .if ${MK_BIND_LIBS} != "no"
 LIBISC?=	${DESTDIR}${LIBDIR}/libisc.a
 LIBISCCC?=	${DESTDIR}${LIBDIR}/libisccc.a
@@ -81,7 +83,9 @@ LIBMILTER?=	${DESTDIR}${LIBDIR}/libmilter.a
 .endif
 LIBMP?=		${DESTDIR}${LIBDIR}/libmp.a
 LIBMYTINFO?=	"don't use LIBMYTINFO, use LIBNCURSES"
+.if ${MK_NCP} != "no"
 LIBNCP?=	${DESTDIR}${LIBDIR}/libncp.a
+.endif
 LIBNCURSES?=	${DESTDIR}${LIBDIR}/libncurses.a
 LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnetgraph.a
 LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a

share/mk/bsd.own.mk

@@ -328,6 +328,7 @@ WITH_IDEA=
     LPR \
     MAILWRAPPER \
     MAN \
+    NCP \
     NETCAT \
     NIS \
     NLS \
@@ -406,6 +407,10 @@ MK_KERBEROS:=	no
 MK_COLLECT2:=	no
 .endif
 
+.if ${MK_IPX} == "no"
+MK_NCP:=	no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no

sys/modules/Makefile

@@ -358,11 +358,15 @@ _linprocfs=	linprocfs
 _linux=		linux
 _lnc=		lnc
 _mse=		mse
+.if ${MK_NCP} != "no"
 _ncp=		ncp
+.endif
 _ncv=		ncv
 _ndis=		ndis
 _nsp=		nsp
+.if ${MK_NCP} != "no"
 _nwfs=		nwfs
+.endif
 _oltr=		oltr
 _pccard=	pccard
 _pcfclock=	pcfclock

usr.bin/Makefile

@@ -303,8 +303,10 @@ _usbhidctl=	usbhidctl
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
+.if ${MK_NCP} != "no"
 _ncplist=	ncplist
 _ncplogin=	ncplogin
+.endif
 _smbutil=	smbutil
 .endif
 
@@ -313,8 +315,10 @@ _uac=		uac
 .endif
 
 .if ${MACHINE_ARCH} == "amd64"
+.if ${MK_NCP} != "no"
 _ncplist=	ncplist
 _ncplogin=	ncplogin
+.endif
 _smbutil=	smbutil
 .endif
 

usr.sbin/Makefile

@@ -65,7 +65,7 @@ SUBDIR=	ac \
 	iostat \
 	ip6addrctl \
 	ipfwpcap \
-	IPXrouted \
+	${_IPXrouted} \
 	jail \
 	jexec \
 	jls \
@@ -236,6 +236,10 @@ _route6d=	route6d
 _traceroute6=	traceroute6
 .endif
 
+.if ${MK_IPX} != "no"
+_IPXrouted=	IPXrouted
+.endif
+
 .if ${MK_NIS} != "no"
 _rpc.yppasswdd=	rpc.yppasswdd
 _rpc.ypupdated=	rpc.ypupdated
@@ -283,7 +287,9 @@ _i4b=		i4b
 _kgmon=		kgmon
 _kgzip=		kgzip
 _lptcontrol=	lptcontrol
+.if ${MK_NCP} != "no"
 _mount_nwfs=	mount_nwfs
+.endif
 _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt
@@ -330,7 +336,9 @@ _boot0cfg=	boot0cfg
 _btxld=		btxld
 _kgmon=		kgmon
 _lptcontrol=	lptcontrol
+.if ${MK_NCP} != "no"
 _mount_nwfs=	mount_nwfs
+.endif
 _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt