freebsd11_network -> freebsd_network.

FreeBSD 12 has no major changes to the ifnet KPIs that constitute a
source compatibility break, save a single one related to locking
which doesn't really apply to us, and so we don't need to create
a "freebsd12_network" directory to work through the upgrades.

build/jam/packages/HaikuDevel

@@ -65,7 +65,7 @@ AddHeaderDirectoryToPackage posix ;
 # private headers
 AddHeaderDirectoryToPackage private ;
 CopyDirectoryToPackage develop headers private libs compat
-	: [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network ]
+	: [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ]
 	: : -x *.c -x *.cpp -x *.awk -x Jamfile -x miidevs -x usbdevs ;
 CopyDirectoryToPackage develop headers private libs compat
 	: [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ]

src/add-ons/kernel/drivers/network/3com/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network 3com ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -19,11 +19,11 @@ KernelAddon 3com :
 	bmtphy.c
 	ukphy.c
 	ukphy_subr.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;
 
 ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ukphy$(SUFOBJ) xlphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
+		compat freebsd_network ] ;
 Includes [ FGristFiles bmtphy.c ukphy.c xlphy.c ]
-	: <src!libs!compat!freebsd11_network>miidevs.h ;
+	: <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/ar81xx/dev/ale/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx dev ale ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,5 +11,5 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon ar81xx :
 	if_ale.c
 	glue.c
-	: ar81xx_mii.a libfreebsd11_network.a
+	: ar81xx_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/ar81xx/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network ar81xx dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;

src/add-ons/kernel/drivers/network/atheros813x/dev/alc/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network atheros813x dev alc ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 
 UsePrivateHeaders net system ;
@@ -13,6 +13,6 @@ SubDirCcFlags [ FDefines _KERNEL=1 ] ;
 KernelAddon atheros813x :
 	if_alc.c
 	glue.c
-	: atheros813x_mii.a libfreebsd11_network.a
+	: atheros813x_mii.a libfreebsd_network.a
 	;
 

src/add-ons/kernel/drivers/network/atheros813x/dev/mii/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network atheros813x dev mii ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;

src/add-ons/kernel/drivers/network/attansic_l1/dev/age/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev age ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,5 +11,5 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon attansic_l1 :
 	if_age.c
 	glue.c
-	: atl1_mii.a libfreebsd11_network.a
+	: atl1_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/attansic_l1/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l1 dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -15,6 +15,6 @@ KernelStaticLibrary atl1_mii.a
 
 ObjectHdrs [ FGristFiles atphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
+		compat freebsd_network ] ;
 Includes [ FGristFiles atphy.c ]
-	: <src!libs!compat!freebsd11_network>miidevs.h ;
+	: <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 dev ae ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,5 +11,5 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon attansic_l2 :
 	if_ae.c
 	glue.c
-	: attansic_l2_mii.a libfreebsd11_network.a
+	: attansic_l2_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;

src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev bfe ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
 UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -14,6 +14,6 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ]
 KernelAddon broadcom440x :
 	if_bfe.c
 	glue.c
-	: broadcom440x_mii.a libfreebsd11_network.a
+	: broadcom440x_mii.a libfreebsd_network.a
 	;
 

src/add-ons/kernel/drivers/network/broadcom440x/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network broadcom440x dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -15,5 +15,5 @@ KernelStaticLibrary broadcom440x_mii.a
 
 ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles bmtphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles bmtphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev bge ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
 UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -12,10 +12,10 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 _XOPEN_SOURCE ] ;
 KernelAddon broadcom570x :
 	if_bge.c
 	glue.c
-	: broadcom570x_mii.a libfreebsd11_network.a
+	: broadcom570x_mii.a libfreebsd_network.a
 	;
 
 ObjectHdrs [ FGristFiles if_bge$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles if_bge.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles if_bge.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -17,5 +17,5 @@ KernelStaticLibrary broadcom570x_mii.a
 
 ObjectHdrs [ FGristFiles brgphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles brgphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles brgphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/dec21xxx/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network dec21xxx ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -25,12 +25,12 @@ KernelAddon dec21xxx :
 	amphy.c
 	ukphy.c
 	ukphy_subr.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;
 
 ObjectHdrs [ FGristFiles dcphy$(SUFOBJ)	pnphy$(SUFOBJ) if_de$(SUFOBJ)
 		acphy$(SUFOBJ) amphy$(SUFOBJ) ukphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
+		compat freebsd_network ] ;
 Includes [ FGristFiles dcphy.c pnphy.c acphy.c amphy.c ]
-	: <src!libs!compat!freebsd11_network>miidevs.h ;
+	: <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/emulex_oce/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network emulex_oce ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -19,5 +19,5 @@ KernelAddon emulex_oce :
 	oce_queue.c
 	oce_sysctl.c
 	oce_util.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/ipro100/dev/fxp/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network ipro100 dev fxp ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -12,10 +12,10 @@ KernelAddon ipro100 :
 	if_fxp.c
 	glue.c
 	inphy.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;
 
 ObjectHdrs [ FGristFiles inphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles inphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles inphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/ipro1000/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network ipro1000 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -34,5 +34,5 @@ KernelAddon ipro1000 :
 	if_igb.c
 
 	glue.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/jmicron2x0/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network jmicron2x0 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -16,10 +16,10 @@ KernelAddon jmicron2x0 :
 	glue.c
 	if_jme.c
 	jmphy.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;
 
 ObjectHdrs [ FGristFiles jmphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles jmphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles jmphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -17,5 +17,5 @@ KernelStaticLibrary marvell_yukon_mii.a
 
 ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles e1000phy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles e1000phy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev msk ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,5 +11,5 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon marvell_yukon :
 	if_msk.c
 	glue.c
-	: marvell_yukon_mii.a libfreebsd11_network.a
+	: marvell_yukon_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/nforce/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net ;
 UsePrivateKernelHeaders ;
@@ -17,5 +17,5 @@ KernelStaticLibrary nforce_mii.a
 
 ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles ciphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles ciphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/nforce/dev/nfe/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network nforce dev nfe ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net ;
 UsePrivateKernelHeaders ;
@@ -12,5 +12,5 @@ KernelAddon nforce :
 	if_nfe.c
 
 	glue.c
-	: nforce_mii.a libfreebsd11_network.a
+	: nforce_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/pcnet/dev/le/Jamfile

@@ -1,8 +1,8 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev le ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -15,5 +15,5 @@ KernelAddon pcnet :
 	if_le_pci.c
 	lance.c
 	glue.c
-	: pcnet_pcn.a pcnet_mii.a libfreebsd11_network.a
+	: pcnet_pcn.a pcnet_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/pcnet/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -18,6 +18,6 @@ KernelStaticLibrary pcnet_mii.a
 
 ObjectHdrs [ FGristFiles nsphy$(SUFOBJ) nsphyter$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
+		compat freebsd_network ] ;
 Includes [ FGristFiles nsphy.c nsphyter.c ]
-	: <src!libs!compat!freebsd11_network>miidevs.h ;
+	: <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/pcnet/dev/pcn/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network pcnet dev pcn ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;

src/add-ons/kernel/drivers/network/pegasus/Jamfile

@@ -15,5 +15,5 @@ KernelAddon pegasus :
 
 ObjectHdrs [ FGristFiles driver$(SUFOBJ) if_aue$(SUFOBJ) ]
     : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-	    compat freebsd11_network ] ;
-Includes [ FGristFiles driver.c if_aue.c ] : <src!libs!compat!freebsd11_network>usbdevs.h ;
+	    compat freebsd_network ] ;
+Includes [ FGristFiles driver.c if_aue.c ] : <src!libs!compat!freebsd_network>usbdevs.h ;

src/add-ons/kernel/drivers/network/rdc/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network rdc dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net ;
 UsePrivateKernelHeaders ;
@@ -15,5 +15,5 @@ KernelStaticLibrary rdc_mii.a
 
 ObjectHdrs [ FGristFiles rdcphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles rdcphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles rdcphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/rdc/dev/vte/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network rdc dev vte ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,5 +11,5 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon rdc :
 	if_vte.c
 	glue.c
-	: rdc_mii.a libfreebsd11_network.a
+	: rdc_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 
 UsePrivateHeaders net system ;
@@ -15,5 +15,5 @@ KernelStaticLibrary rtl8139_mii.a :
 
 ObjectHdrs [ FGristFiles rlphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles rlphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles rlphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/rtl8139/dev/rl/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network rtl8139 dev rl ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,6 +11,6 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon rtl8139 :
 	if_rl.c
 	glue.c
-	: rtl8139_mii.a libfreebsd11_network.a
+	: rtl8139_mii.a libfreebsd_network.a
 	;
 

src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network rtl81xx dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 
 UsePrivateHeaders net system ;
@@ -19,6 +19,6 @@ SEARCH on [ FGristFiles rlphy.c ] = [ FDirName $(HAIKU_TOP) src add-ons kernel
 
 ObjectHdrs [ FGristFiles rgephy$(SUFOBJ) rlphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
+		compat freebsd_network ] ;
 Includes [ FGristFiles rgephy.c rlphy.c ]
-	: <src!libs!compat!freebsd11_network>miidevs.h ;
+	: <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/rtl81xx/dev/re/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network rtl81xx dev re ;
 
 UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,5 +11,5 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon rtl81xx :
 	if_re.c
 	glue.c
-	: rtl81xx_mii.a libfreebsd11_network.a
+	: rtl81xx_mii.a libfreebsd_network.a
 ;

src/add-ons/kernel/drivers/network/sis900/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network sis900 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -19,10 +19,10 @@ KernelAddon sis900 :
 	ukphy.c
 	ukphy_subr.c
 	if_sis.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;
 
 ObjectHdrs [ FGristFiles icsphy$(SUFOBJ) nsphyter$(SUFOBJ) ukphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles icsphy.c nsphyter.c ukphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles icsphy.c nsphyter.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -18,7 +18,7 @@ KernelStaticLibrary syskonnect_mii.a
 
 ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ukphy$(SUFOBJ) xmphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
+		compat freebsd_network ] ;
 Includes [ FGristFiles e1000phy.c ukphy.c xmphy.c ]
-	: <src!libs!compat!freebsd11_network>miidevs.h ;
+	: <src!libs!compat!freebsd_network>miidevs.h ;
 

src/add-ons/kernel/drivers/network/syskonnect/dev/sk/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network syskonnect dev sk ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -11,5 +11,5 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon syskonnect :
 	if_sk.c
 	glue.c
-	: syskonnect_mii.a libfreebsd11_network.a
+	: syskonnect_mii.a libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/via_rhine/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -18,10 +18,10 @@ KernelAddon via_rhine :
 	ukphy.c
 	ukphy_subr.c
 	if_vr.c
-	: libfreebsd11_network.a
+	: libfreebsd_network.a
 	;
 
 ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ukphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles ciphy.c ukphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles ciphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;

src/add-ons/kernel/drivers/network/vt612x/dev/mii/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network vt612x dev mii ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -17,6 +17,6 @@ KernelStaticLibrary vt612x_mii.a
 
 ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ukphy$(SUFOBJ) ]
 	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd11_network ] ;
-Includes [ FGristFiles ciphy.c ukphy.c ] : <src!libs!compat!freebsd11_network>miidevs.h ;
+		compat freebsd_network ] ;
+Includes [ FGristFiles ciphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
 

src/add-ons/kernel/drivers/network/vt612x/dev/vge/Jamfile

@@ -3,8 +3,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network vt612x dev vge ;
 SubDirCcFlags -Wall ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -14,6 +14,6 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
 KernelAddon vt612x :
 	if_vge.c
 	glue.c
-	: vt612x_mii.a libfreebsd11_network.a
+	: vt612x_mii.a libfreebsd_network.a
 	;
 

src/add-ons/kernel/drivers/network/wlan/aironetwifi/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan aironetwifi ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -21,5 +21,5 @@ KernelAddon aironetwifi :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/wlan/atheroswifi/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan atheroswifi ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -46,7 +46,7 @@ KernelAddon atheroswifi :
 	atheroswifi_rate.o
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ath ath_hal ] ;

src/add-ons/kernel/drivers/network/wlan/broadcom43xx/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan broadcom43xx ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -29,5 +29,5 @@ KernelAddon broadcom43xx :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/wlan/idualwifi7260/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan idualwifi7260 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -35,7 +35,7 @@ KernelAddon idualwifi7260 :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 HAIKU_WIFI_FIRMWARE_PACKAGES on idualwifi7260 =

src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2100 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -20,7 +20,7 @@ KernelAddon iprowifi2100 :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 # Note: Due to licensing restrictions, we can only distribute the archive.

src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2200 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -24,7 +24,7 @@ KernelAddon iprowifi2200 :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 # Note: Due to licensing restrictions, we can only distribute the archive.

src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi3945 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -20,7 +20,7 @@ KernelAddon iprowifi3945 :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 HAIKU_WIFI_FIRMWARE_PACKAGE on iprowifi3945 = iwlwifi-3945-ucode-15.32.2.9 ;

src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi4965 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -20,7 +20,7 @@ KernelAddon iprowifi4965 :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 HAIKU_WIFI_FIRMWARE_PACKAGES on iprowifi4965 =

src/add-ons/kernel/drivers/network/wlan/marvell88w8335/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan marvell88w8335 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -22,5 +22,5 @@ KernelAddon marvell88w8335 :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;

src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan marvell88w8363 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -23,7 +23,7 @@ KernelAddon marvell88w8363 :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 HAIKU_WIFI_FIRMWARE_PACKAGE on marvell88w8363 = "" ;

src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan ralinkwifi ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -23,7 +23,7 @@ KernelAddon ralinkwifi :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 HAIKU_WIFI_FIRMWARE_PACKAGES on ralinkwifi = RT61_Firmware_V1.2

src/add-ons/kernel/drivers/network/wlan/realtekwifi/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan realtekwifi ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -20,7 +20,7 @@ KernelAddon realtekwifi :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;
 
 HAIKU_WIFI_FIRMWARE_PACKAGES on realtekwifi = rtwn-rtl8192cfw ;

src/add-ons/kernel/drivers/network/wlan/wavelanwifi/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan wavelanwifi ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ]
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UsePrivateHeaders net system ;
@@ -25,5 +25,5 @@ KernelAddon wavelanwifi :
 	glue.c
 	:
 	libfreebsd11_wlan.a
-	libfreebsd11_network.a
+	libfreebsd_network.a
 	;

src/bin/network/ifconfig/ifconfig.cpp

@@ -27,8 +27,8 @@
 #include <NetServer.h>
 
 extern "C" {
-#	include <freebsd11_network/compat/sys/cdefs.h>
-#	include <freebsd11_network/compat/sys/ioccom.h>
+#	include <freebsd_network/compat/sys/cdefs.h>
+#	include <freebsd_network/compat/sys/ioccom.h>
 #	include <net80211/ieee80211_ioctl.h>
 }
 

src/kits/network/libnetapi/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src kits network libnetapi ;
 UsePrivateHeaders app net shared storage support ;
 UsePrivateHeaders locale shared ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons network_settings ]
 	: true ;

src/libs/compat/Jamfile

@@ -1,4 +1,4 @@
 SubDir HAIKU_TOP src libs compat ;
 
-SubInclude HAIKU_TOP src libs compat freebsd11_network ;
+SubInclude HAIKU_TOP src libs compat freebsd_network ;
 SubInclude HAIKU_TOP src libs compat freebsd11_wlan ;

src/libs/compat/freebsd11_wlan/net80211/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src libs compat freebsd11_wlan net80211 ;
 
-UseHeaders [ FDirName $(SUBDIR) .. .. freebsd11_network ] : true ;
-UseHeaders [ FDirName $(SUBDIR) .. .. freebsd11_network compat ] : true ;
+UseHeaders [ FDirName $(SUBDIR) .. .. freebsd_network ] : true ;
+UseHeaders [ FDirName $(SUBDIR) .. .. freebsd_network compat ] : true ;
 UseHeaders [ FDirName $(SUBDIR) .. ] : true ;
 UseHeaders [ FDirName $(SUBDIR) ] : true ;
 UsePrivateHeaders net system ;

src/libs/compat/freebsd_network/Jamfile

@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src libs compat freebsd11_network ;
+SubDir HAIKU_TOP src libs compat freebsd_network ;
 
 UseHeaders [ FDirName $(SUBDIR) ] : true ;
 UseHeaders [ FDirName $(SUBDIR) compat ] : true ;
@@ -12,7 +12,7 @@ Includes [ FGristFiles kernel_c++_structs.h ]
 
 SubDirCcFlags [ FDefines _KERNEL=1 _XOPEN_SOURCE ] ;
 
-KernelStaticLibrary libfreebsd11_network.a :
+KernelStaticLibrary libfreebsd_network.a :
 	bus.cpp
 	callout.cpp
 	clock.c