[Midnightbsd-cvs] src [9983] trunk/sys/modules: sync

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 26 17:14:16 EDT 2018


Revision: 9983
          http://svnweb.midnightbsd.org/src/?rev=9983
Author:   laffer1
Date:     2018-05-26 17:14:14 -0400 (Sat, 26 May 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/modules/3dfx/Makefile
    trunk/sys/modules/3dfx_linux/Makefile
    trunk/sys/modules/Makefile
    trunk/sys/modules/Makefile.inc
    trunk/sys/modules/aac/Makefile
    trunk/sys/modules/aac/Makefile.inc
    trunk/sys/modules/aac/aac_linux/Makefile
    trunk/sys/modules/accf_data/Makefile
    trunk/sys/modules/accf_dns/Makefile
    trunk/sys/modules/accf_http/Makefile
    trunk/sys/modules/acpi/Makefile
    trunk/sys/modules/acpi/Makefile.inc
    trunk/sys/modules/acpi/acpi/Makefile
    trunk/sys/modules/acpi/acpi_asus/Makefile
    trunk/sys/modules/acpi/acpi_dock/Makefile
    trunk/sys/modules/acpi/acpi_fujitsu/Makefile
    trunk/sys/modules/acpi/acpi_hp/Makefile
    trunk/sys/modules/acpi/acpi_ibm/Makefile
    trunk/sys/modules/acpi/acpi_panasonic/Makefile
    trunk/sys/modules/acpi/acpi_sony/Makefile
    trunk/sys/modules/acpi/acpi_toshiba/Makefile
    trunk/sys/modules/acpi/acpi_video/Makefile
    trunk/sys/modules/acpi/acpi_wmi/Makefile
    trunk/sys/modules/acpi/aibs/Makefile
    trunk/sys/modules/ae/Makefile
    trunk/sys/modules/aesni/Makefile
    trunk/sys/modules/age/Makefile
    trunk/sys/modules/agp/Makefile
    trunk/sys/modules/aha/Makefile
    trunk/sys/modules/ahb/Makefile
    trunk/sys/modules/ahci/Makefile
    trunk/sys/modules/aic/Makefile
    trunk/sys/modules/aic7xxx/Makefile
    trunk/sys/modules/aic7xxx/Makefile.inc
    trunk/sys/modules/aic7xxx/ahc/Makefile
    trunk/sys/modules/aic7xxx/ahc/Makefile.inc
    trunk/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
    trunk/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
    trunk/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
    trunk/sys/modules/aic7xxx/ahd/Makefile
    trunk/sys/modules/aic7xxx/aicasm/Makefile
    trunk/sys/modules/aio/Makefile
    trunk/sys/modules/alc/Makefile
    trunk/sys/modules/ale/Makefile
    trunk/sys/modules/alq/Makefile
    trunk/sys/modules/amd/Makefile
    trunk/sys/modules/amdsbwd/Makefile
    trunk/sys/modules/amdtemp/Makefile
    trunk/sys/modules/amr/Makefile
    trunk/sys/modules/amr/amr_cam/Makefile
    trunk/sys/modules/amr/amr_linux/Makefile
    trunk/sys/modules/an/Makefile
    trunk/sys/modules/aout/Makefile
    trunk/sys/modules/apm/Makefile
    trunk/sys/modules/arcmsr/Makefile
    trunk/sys/modules/arcnet/Makefile
    trunk/sys/modules/asmc/Makefile
    trunk/sys/modules/asr/Makefile
    trunk/sys/modules/ata/Makefile
    trunk/sys/modules/ata/Makefile.inc
    trunk/sys/modules/ata/atacam/Makefile
    trunk/sys/modules/ata/atacard/Makefile
    trunk/sys/modules/ata/atacbus/Makefile
    trunk/sys/modules/ata/atacore/Makefile
    trunk/sys/modules/ata/atadevel/Makefile
    trunk/sys/modules/ata/atadevel/ata-devel.c
    trunk/sys/modules/ata/atadisk/Makefile
    trunk/sys/modules/ata/ataisa/Makefile
    trunk/sys/modules/ata/atapci/Makefile
    trunk/sys/modules/ata/atapci/Makefile.inc
    trunk/sys/modules/ata/atapci/chipsets/Makefile
    trunk/sys/modules/ata/atapci/chipsets/Makefile.inc
    trunk/sys/modules/ata/atapci/chipsets/ataacard/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataahci/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataamd/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataati/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atacenatek/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atacypress/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atacyrix/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataintel/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataite/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atajmicron/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atamarvell/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atamicron/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atanational/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atanetcell/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atanvidia/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atapromise/Makefile
    trunk/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atasis/Makefile
    trunk/sys/modules/ata/atapci/chipsets/atavia/Makefile
    trunk/sys/modules/ata/atapicam/Makefile
    trunk/sys/modules/ata/atapicd/Makefile
    trunk/sys/modules/ata/atapifd/Makefile
    trunk/sys/modules/ata/atapist/Makefile
    trunk/sys/modules/ata/ataraid/Makefile
    trunk/sys/modules/ath/Makefile
    trunk/sys/modules/ath_ahb/Makefile
    trunk/sys/modules/ath_pci/Makefile
    trunk/sys/modules/auxio/Makefile
    trunk/sys/modules/bce/Makefile
    trunk/sys/modules/bfe/Makefile
    trunk/sys/modules/bge/Makefile
    trunk/sys/modules/bios/Makefile
    trunk/sys/modules/bios/smapi/Makefile
    trunk/sys/modules/bios/smbios/Makefile
    trunk/sys/modules/bios/vpd/Makefile
    trunk/sys/modules/bktr/Makefile
    trunk/sys/modules/bktr/Makefile.inc
    trunk/sys/modules/bktr/bktr/Makefile
    trunk/sys/modules/bktr/bktr_mem/Makefile
    trunk/sys/modules/bm/Makefile
    trunk/sys/modules/bridgestp/Makefile
    trunk/sys/modules/bwi/Makefile
    trunk/sys/modules/bwn/Makefile
    trunk/sys/modules/bxe/Makefile
    trunk/sys/modules/cam/Makefile
    trunk/sys/modules/canbepm/Makefile
    trunk/sys/modules/canbus/Makefile
    trunk/sys/modules/cardbus/Makefile
    trunk/sys/modules/cas/Makefile
    trunk/sys/modules/cbb/Makefile
    trunk/sys/modules/cc/Makefile
    trunk/sys/modules/cc/cc_chd/Makefile
    trunk/sys/modules/cc/cc_cubic/Makefile
    trunk/sys/modules/cc/cc_hd/Makefile
    trunk/sys/modules/cc/cc_htcp/Makefile
    trunk/sys/modules/cc/cc_vegas/Makefile
    trunk/sys/modules/cd9660/Makefile
    trunk/sys/modules/cd9660_iconv/Makefile
    trunk/sys/modules/ce/Makefile
    trunk/sys/modules/ciss/Makefile
    trunk/sys/modules/cm/Makefile
    trunk/sys/modules/cmx/Makefile
    trunk/sys/modules/coff/Makefile
    trunk/sys/modules/coretemp/Makefile
    trunk/sys/modules/cp/Makefile
    trunk/sys/modules/cpuctl/Makefile
    trunk/sys/modules/cpufreq/Makefile
    trunk/sys/modules/crypto/Makefile
    trunk/sys/modules/cryptodev/Makefile
    trunk/sys/modules/cs/Makefile
    trunk/sys/modules/ctau/Makefile
    trunk/sys/modules/cx/Makefile
    trunk/sys/modules/cxgb/Makefile
    trunk/sys/modules/cxgb/cxgb/Makefile
    trunk/sys/modules/cxgb/cxgb_t3fw/Makefile
    trunk/sys/modules/cxgb/iw_cxgb/Makefile
    trunk/sys/modules/cxgb/tom/Makefile
    trunk/sys/modules/cxgbe/Makefile
    trunk/sys/modules/cxgbe/if_cxgbe/Makefile
    trunk/sys/modules/cxgbe/t4_firmware/Makefile
    trunk/sys/modules/cxgbe/t5_firmware/Makefile
    trunk/sys/modules/cxgbe/tom/Makefile
    trunk/sys/modules/dc/Makefile
    trunk/sys/modules/dcons/Makefile
    trunk/sys/modules/dcons_crom/Makefile
    trunk/sys/modules/de/Makefile
    trunk/sys/modules/digi/Makefile
    trunk/sys/modules/digi/Makefile.inc
    trunk/sys/modules/digi/digi/Makefile
    trunk/sys/modules/digi/digi_CX/Makefile
    trunk/sys/modules/digi/digi_CX_PCI/Makefile
    trunk/sys/modules/digi/digi_EPCX/Makefile
    trunk/sys/modules/digi/digi_EPCX_PCI/Makefile
    trunk/sys/modules/digi/digi_Xe/Makefile
    trunk/sys/modules/digi/digi_Xem/Makefile
    trunk/sys/modules/digi/digi_Xr/Makefile
    trunk/sys/modules/dpms/Makefile
    trunk/sys/modules/dpt/Makefile
    trunk/sys/modules/drm/Makefile
    trunk/sys/modules/drm/Makefile.inc
    trunk/sys/modules/drm/drm/Makefile
    trunk/sys/modules/drm/i915/Makefile
    trunk/sys/modules/drm/mach64/Makefile
    trunk/sys/modules/drm/mga/Makefile
    trunk/sys/modules/drm/r128/Makefile
    trunk/sys/modules/drm/radeon/Makefile
    trunk/sys/modules/drm/savage/Makefile
    trunk/sys/modules/drm/sis/Makefile
    trunk/sys/modules/drm/tdfx/Makefile
    trunk/sys/modules/drm/via/Makefile
    trunk/sys/modules/drm2/Makefile
    trunk/sys/modules/drm2/Makefile.inc
    trunk/sys/modules/drm2/drm2/Makefile
    trunk/sys/modules/drm2/i915kms/Makefile
    trunk/sys/modules/dtrace/Makefile
    trunk/sys/modules/dtrace/Makefile.inc
    trunk/sys/modules/dtrace/dtmalloc/Makefile
    trunk/sys/modules/dtrace/dtnfscl/Makefile
    trunk/sys/modules/dtrace/dtnfsclient/Makefile
    trunk/sys/modules/dtrace/dtrace/Makefile
    trunk/sys/modules/dtrace/dtrace_test/Makefile
    trunk/sys/modules/dtrace/dtraceall/Makefile
    trunk/sys/modules/dtrace/dtraceall/dtraceall.c
    trunk/sys/modules/dtrace/fasttrap/Makefile
    trunk/sys/modules/dtrace/fbt/Makefile
    trunk/sys/modules/dtrace/lockstat/Makefile
    trunk/sys/modules/dtrace/profile/Makefile
    trunk/sys/modules/dtrace/prototype/Makefile
    trunk/sys/modules/dtrace/sdt/Makefile
    trunk/sys/modules/dtrace/systrace/Makefile
    trunk/sys/modules/dtrace/systrace_freebsd32/Makefile
    trunk/sys/modules/dtrace/systrace_linux32/Makefile
    trunk/sys/modules/dummynet/Makefile
    trunk/sys/modules/ed/Makefile
    trunk/sys/modules/elink/Makefile
    trunk/sys/modules/en/Makefile
    trunk/sys/modules/ep/Makefile
    trunk/sys/modules/epic/Makefile
    trunk/sys/modules/esp/Makefile
    trunk/sys/modules/et/Makefile
    trunk/sys/modules/ex/Makefile
    trunk/sys/modules/exca/Makefile
    trunk/sys/modules/ext2fs/Makefile
    trunk/sys/modules/fatm/Makefile
    trunk/sys/modules/fdc/Makefile
    trunk/sys/modules/fdescfs/Makefile
    trunk/sys/modules/fe/Makefile
    trunk/sys/modules/filemon/Makefile
    trunk/sys/modules/firewire/Makefile
    trunk/sys/modules/firewire/Makefile.inc
    trunk/sys/modules/firewire/firewire/Makefile
    trunk/sys/modules/firewire/fwe/Makefile
    trunk/sys/modules/firewire/fwip/Makefile
    trunk/sys/modules/firewire/sbp/Makefile
    trunk/sys/modules/firewire/sbp_targ/Makefile
    trunk/sys/modules/firmware/Makefile
    trunk/sys/modules/fxp/Makefile
    trunk/sys/modules/gem/Makefile
    trunk/sys/modules/geom/Makefile
    trunk/sys/modules/geom/Makefile.inc
    trunk/sys/modules/geom/geom_bde/Makefile
    trunk/sys/modules/geom/geom_bsd/Makefile
    trunk/sys/modules/geom/geom_cache/Makefile
    trunk/sys/modules/geom/geom_ccd/Makefile
    trunk/sys/modules/geom/geom_concat/Makefile
    trunk/sys/modules/geom/geom_eli/Makefile
    trunk/sys/modules/geom/geom_fox/Makefile
    trunk/sys/modules/geom/geom_gate/Makefile
    trunk/sys/modules/geom/geom_journal/Makefile
    trunk/sys/modules/geom/geom_label/Makefile
    trunk/sys/modules/geom/geom_linux_lvm/Makefile
    trunk/sys/modules/geom/geom_mbr/Makefile
    trunk/sys/modules/geom/geom_mirror/Makefile
    trunk/sys/modules/geom/geom_mountver/Makefile
    trunk/sys/modules/geom/geom_multipath/Makefile
    trunk/sys/modules/geom/geom_nop/Makefile
    trunk/sys/modules/geom/geom_part/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_apm/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_bsd/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_ebr/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_gpt/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_ldm/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_mbr/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_pc98/Makefile
    trunk/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile
    trunk/sys/modules/geom/geom_raid/Makefile
    trunk/sys/modules/geom/geom_raid3/Makefile
    trunk/sys/modules/geom/geom_sched/Makefile
    trunk/sys/modules/geom/geom_sched/Makefile.inc
    trunk/sys/modules/geom/geom_sched/gs_sched/Makefile
    trunk/sys/modules/geom/geom_sched/gsched_rr/Makefile
    trunk/sys/modules/geom/geom_shsec/Makefile
    trunk/sys/modules/geom/geom_stripe/Makefile
    trunk/sys/modules/geom/geom_sunlabel/Makefile
    trunk/sys/modules/geom/geom_uncompress/Makefile
    trunk/sys/modules/geom/geom_uzip/Makefile
    trunk/sys/modules/geom/geom_vinum/Makefile
    trunk/sys/modules/geom/geom_virstor/Makefile
    trunk/sys/modules/geom/geom_vol_ffs/Makefile
    trunk/sys/modules/geom/geom_zero/Makefile
    trunk/sys/modules/glxiic/Makefile
    trunk/sys/modules/glxsb/Makefile
    trunk/sys/modules/hatm/Makefile
    trunk/sys/modules/hifn/Makefile
    trunk/sys/modules/hme/Makefile
    trunk/sys/modules/hpt27xx/Makefile
    trunk/sys/modules/hptiop/Makefile
    trunk/sys/modules/hptmv/Makefile
    trunk/sys/modules/hptrr/Makefile
    trunk/sys/modules/hwpmc/Makefile
    trunk/sys/modules/i2c/Makefile
    trunk/sys/modules/i2c/Makefile.inc
    trunk/sys/modules/i2c/controllers/Makefile
    trunk/sys/modules/i2c/controllers/Makefile.inc
    trunk/sys/modules/i2c/controllers/alpm/Makefile
    trunk/sys/modules/i2c/controllers/amdpm/Makefile
    trunk/sys/modules/i2c/controllers/amdsmb/Makefile
    trunk/sys/modules/i2c/controllers/ichsmb/Makefile
    trunk/sys/modules/i2c/controllers/intpm/Makefile
    trunk/sys/modules/i2c/controllers/lpbb/Makefile
    trunk/sys/modules/i2c/controllers/nfsmb/Makefile
    trunk/sys/modules/i2c/controllers/pcf/Makefile
    trunk/sys/modules/i2c/controllers/viapm/Makefile
    trunk/sys/modules/i2c/if_ic/Makefile
    trunk/sys/modules/i2c/iic/Makefile
    trunk/sys/modules/i2c/iicbb/Makefile
    trunk/sys/modules/i2c/iicbus/Makefile
    trunk/sys/modules/i2c/iicsmb/Makefile
    trunk/sys/modules/i2c/smb/Makefile
    trunk/sys/modules/i2c/smbus/Makefile
    trunk/sys/modules/ibcs2/Makefile
    trunk/sys/modules/ichwd/Makefile
    trunk/sys/modules/ida/Makefile
    trunk/sys/modules/ie/Makefile
    trunk/sys/modules/if_bridge/Makefile
    trunk/sys/modules/if_carp/Makefile
    trunk/sys/modules/if_disc/Makefile
    trunk/sys/modules/if_edsc/Makefile
    trunk/sys/modules/if_ef/Makefile
    trunk/sys/modules/if_epair/Makefile
    trunk/sys/modules/if_faith/Makefile
    trunk/sys/modules/if_gif/Makefile
    trunk/sys/modules/if_gre/Makefile
    trunk/sys/modules/if_lagg/Makefile
    trunk/sys/modules/if_ndis/Makefile
    trunk/sys/modules/if_stf/Makefile
    trunk/sys/modules/if_tap/Makefile
    trunk/sys/modules/if_tun/Makefile
    trunk/sys/modules/if_vlan/Makefile
    trunk/sys/modules/iir/Makefile
    trunk/sys/modules/io/Makefile
    trunk/sys/modules/ip6_mroute_mod/Makefile
    trunk/sys/modules/ip_mroute_mod/Makefile
    trunk/sys/modules/ipdivert/Makefile
    trunk/sys/modules/ipfilter/Makefile
    trunk/sys/modules/ipfw/Makefile
    trunk/sys/modules/ipfw_nat/Makefile
    trunk/sys/modules/ipmi/Makefile
    trunk/sys/modules/ipmi/ipmi_linux/Makefile
    trunk/sys/modules/ips/Makefile
    trunk/sys/modules/ipw/Makefile
    trunk/sys/modules/ipwfw/Makefile
    trunk/sys/modules/ipwfw/ipw_bss/Makefile
    trunk/sys/modules/ipwfw/ipw_ibss/Makefile
    trunk/sys/modules/ipwfw/ipw_monitor/Makefile
    trunk/sys/modules/isci/Makefile
    trunk/sys/modules/iscsi/Makefile
    trunk/sys/modules/iscsi/initiator/Makefile
    trunk/sys/modules/isp/Makefile
    trunk/sys/modules/ispfw/Makefile
    trunk/sys/modules/ispfw/isp_1000/Makefile
    trunk/sys/modules/ispfw/isp_1040/Makefile
    trunk/sys/modules/ispfw/isp_1040_it/Makefile
    trunk/sys/modules/ispfw/isp_1080/Makefile
    trunk/sys/modules/ispfw/isp_1080_it/Makefile
    trunk/sys/modules/ispfw/isp_12160/Makefile
    trunk/sys/modules/ispfw/isp_12160_it/Makefile
    trunk/sys/modules/ispfw/isp_2100/Makefile
    trunk/sys/modules/ispfw/isp_2200/Makefile
    trunk/sys/modules/ispfw/isp_2300/Makefile
    trunk/sys/modules/ispfw/isp_2322/Makefile
    trunk/sys/modules/ispfw/isp_2400/Makefile
    trunk/sys/modules/ispfw/isp_2400_multi/Makefile
    trunk/sys/modules/ispfw/isp_2500/Makefile
    trunk/sys/modules/ispfw/isp_2500_multi/Makefile
    trunk/sys/modules/ispfw/ispfw/Makefile
    trunk/sys/modules/iwi/Makefile
    trunk/sys/modules/iwifw/Makefile
    trunk/sys/modules/iwifw/iwi_bss/Makefile
    trunk/sys/modules/iwifw/iwi_ibss/Makefile
    trunk/sys/modules/iwifw/iwi_monitor/Makefile
    trunk/sys/modules/iwn/Makefile
    trunk/sys/modules/iwnfw/Makefile
    trunk/sys/modules/iwnfw/Makefile.inc
    trunk/sys/modules/iwnfw/iwn1000/Makefile
    trunk/sys/modules/iwnfw/iwn4965/Makefile
    trunk/sys/modules/iwnfw/iwn5000/Makefile
    trunk/sys/modules/iwnfw/iwn5150/Makefile
    trunk/sys/modules/iwnfw/iwn6000/Makefile
    trunk/sys/modules/iwnfw/iwn6000g2a/Makefile
    trunk/sys/modules/iwnfw/iwn6000g2b/Makefile
    trunk/sys/modules/iwnfw/iwn6050/Makefile
    trunk/sys/modules/ixgb/Makefile
    trunk/sys/modules/ixgbe/Makefile
    trunk/sys/modules/jme/Makefile
    trunk/sys/modules/joy/Makefile
    trunk/sys/modules/kbdmux/Makefile
    trunk/sys/modules/kgssapi/Makefile
    trunk/sys/modules/kgssapi_krb5/Makefile
    trunk/sys/modules/khelp/Makefile
    trunk/sys/modules/khelp/h_ertt/Makefile
    trunk/sys/modules/krpc/Makefile
    trunk/sys/modules/ksyms/Makefile
    trunk/sys/modules/le/Makefile
    trunk/sys/modules/lge/Makefile
    trunk/sys/modules/libalias/Makefile
    trunk/sys/modules/libalias/libalias/Makefile
    trunk/sys/modules/libalias/modules/Makefile
    trunk/sys/modules/libalias/modules/Makefile.inc
    trunk/sys/modules/libalias/modules/cuseeme/Makefile
    trunk/sys/modules/libalias/modules/dummy/Makefile
    trunk/sys/modules/libalias/modules/ftp/Makefile
    trunk/sys/modules/libalias/modules/irc/Makefile
    trunk/sys/modules/libalias/modules/modules.inc
    trunk/sys/modules/libalias/modules/nbt/Makefile
    trunk/sys/modules/libalias/modules/pptp/Makefile
    trunk/sys/modules/libalias/modules/skinny/Makefile
    trunk/sys/modules/libalias/modules/smedia/Makefile
    trunk/sys/modules/libiconv/Makefile
    trunk/sys/modules/libmbpool/Makefile
    trunk/sys/modules/libmchain/Makefile
    trunk/sys/modules/linprocfs/Makefile
    trunk/sys/modules/linsysfs/Makefile
    trunk/sys/modules/linux/Makefile
    trunk/sys/modules/lmc/Makefile
    trunk/sys/modules/lpt/Makefile
    trunk/sys/modules/mac_biba/Makefile
    trunk/sys/modules/mac_bsdextended/Makefile
    trunk/sys/modules/mac_ifoff/Makefile
    trunk/sys/modules/mac_lomac/Makefile
    trunk/sys/modules/mac_mls/Makefile
    trunk/sys/modules/mac_none/Makefile
    trunk/sys/modules/mac_partition/Makefile
    trunk/sys/modules/mac_portacl/Makefile
    trunk/sys/modules/mac_seeotheruids/Makefile
    trunk/sys/modules/mac_stub/Makefile
    trunk/sys/modules/mac_test/Makefile
    trunk/sys/modules/malo/Makefile
    trunk/sys/modules/mcd/Makefile
    trunk/sys/modules/md/Makefile
    trunk/sys/modules/mem/Makefile
    trunk/sys/modules/mfi/Makefile
    trunk/sys/modules/mfi/mfi_linux/Makefile
    trunk/sys/modules/mfi/mfip/Makefile
    trunk/sys/modules/mii/Makefile
    trunk/sys/modules/mlx/Makefile
    trunk/sys/modules/mlx4/Makefile
    trunk/sys/modules/mlx4ib/Makefile
    trunk/sys/modules/mlxen/Makefile
    trunk/sys/modules/mly/Makefile
    trunk/sys/modules/mmc/Makefile
    trunk/sys/modules/mmcsd/Makefile
    trunk/sys/modules/mps/Makefile
    trunk/sys/modules/mpt/Makefile
    trunk/sys/modules/mqueue/Makefile
    trunk/sys/modules/msdosfs/Makefile
    trunk/sys/modules/msdosfs_iconv/Makefile
    trunk/sys/modules/mse/Makefile
    trunk/sys/modules/msk/Makefile
    trunk/sys/modules/mthca/Makefile
    trunk/sys/modules/mvs/Makefile
    trunk/sys/modules/mwl/Makefile
    trunk/sys/modules/mwlfw/Makefile
    trunk/sys/modules/mxge/Makefile
    trunk/sys/modules/mxge/mxge/Makefile
    trunk/sys/modules/mxge/mxge_eth_z8e/Makefile
    trunk/sys/modules/mxge/mxge_ethp_z8e/Makefile
    trunk/sys/modules/mxge/mxge_rss_eth_z8e/Makefile
    trunk/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile
    trunk/sys/modules/my/Makefile
    trunk/sys/modules/ncp/Makefile
    trunk/sys/modules/ncv/Makefile
    trunk/sys/modules/ndis/Makefile
    trunk/sys/modules/netgraph/Makefile
    trunk/sys/modules/netgraph/Makefile.inc
    trunk/sys/modules/netgraph/UI/Makefile
    trunk/sys/modules/netgraph/async/Makefile
    trunk/sys/modules/netgraph/atm/Makefile
    trunk/sys/modules/netgraph/atm/Makefile.inc
    trunk/sys/modules/netgraph/atm/atm/Makefile
    trunk/sys/modules/netgraph/atm/atmbase/Makefile
    trunk/sys/modules/netgraph/atm/ccatm/Makefile
    trunk/sys/modules/netgraph/atm/sscfu/Makefile
    trunk/sys/modules/netgraph/atm/sscop/Makefile
    trunk/sys/modules/netgraph/atm/uni/Makefile
    trunk/sys/modules/netgraph/atmllc/Makefile
    trunk/sys/modules/netgraph/bluetooth/Makefile
    trunk/sys/modules/netgraph/bluetooth/Makefile.inc
    trunk/sys/modules/netgraph/bluetooth/bluetooth/Makefile
    trunk/sys/modules/netgraph/bluetooth/bt3c/Makefile
    trunk/sys/modules/netgraph/bluetooth/h4/Makefile
    trunk/sys/modules/netgraph/bluetooth/hci/Makefile
    trunk/sys/modules/netgraph/bluetooth/l2cap/Makefile
    trunk/sys/modules/netgraph/bluetooth/socket/Makefile
    trunk/sys/modules/netgraph/bluetooth/ubt/Makefile
    trunk/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
    trunk/sys/modules/netgraph/bpf/Makefile
    trunk/sys/modules/netgraph/bridge/Makefile
    trunk/sys/modules/netgraph/car/Makefile
    trunk/sys/modules/netgraph/cisco/Makefile
    trunk/sys/modules/netgraph/deflate/Makefile
    trunk/sys/modules/netgraph/device/Makefile
    trunk/sys/modules/netgraph/echo/Makefile
    trunk/sys/modules/netgraph/eiface/Makefile
    trunk/sys/modules/netgraph/etf/Makefile
    trunk/sys/modules/netgraph/ether/Makefile
    trunk/sys/modules/netgraph/ether_echo/Makefile
    trunk/sys/modules/netgraph/fec/Makefile
    trunk/sys/modules/netgraph/frame_relay/Makefile
    trunk/sys/modules/netgraph/gif/Makefile
    trunk/sys/modules/netgraph/gif_demux/Makefile
    trunk/sys/modules/netgraph/hole/Makefile
    trunk/sys/modules/netgraph/hub/Makefile
    trunk/sys/modules/netgraph/iface/Makefile
    trunk/sys/modules/netgraph/ip_input/Makefile
    trunk/sys/modules/netgraph/ipfw/Makefile
    trunk/sys/modules/netgraph/ksocket/Makefile
    trunk/sys/modules/netgraph/l2tp/Makefile
    trunk/sys/modules/netgraph/lmi/Makefile
    trunk/sys/modules/netgraph/mppc/Makefile
    trunk/sys/modules/netgraph/nat/Makefile
    trunk/sys/modules/netgraph/netflow/Makefile
    trunk/sys/modules/netgraph/netgraph/Makefile
    trunk/sys/modules/netgraph/one2many/Makefile
    trunk/sys/modules/netgraph/patch/Makefile
    trunk/sys/modules/netgraph/pipe/Makefile
    trunk/sys/modules/netgraph/ppp/Makefile
    trunk/sys/modules/netgraph/pppoe/Makefile
    trunk/sys/modules/netgraph/pptpgre/Makefile
    trunk/sys/modules/netgraph/pred1/Makefile
    trunk/sys/modules/netgraph/rfc1490/Makefile
    trunk/sys/modules/netgraph/sample/Makefile
    trunk/sys/modules/netgraph/socket/Makefile
    trunk/sys/modules/netgraph/source/Makefile
    trunk/sys/modules/netgraph/split/Makefile
    trunk/sys/modules/netgraph/sppp/Makefile
    trunk/sys/modules/netgraph/tag/Makefile
    trunk/sys/modules/netgraph/tcpmss/Makefile
    trunk/sys/modules/netgraph/tee/Makefile
    trunk/sys/modules/netgraph/tty/Makefile
    trunk/sys/modules/netgraph/vjc/Makefile
    trunk/sys/modules/netgraph/vlan/Makefile
    trunk/sys/modules/netmap/Makefile
    trunk/sys/modules/nfe/Makefile
    trunk/sys/modules/nfs_common/Makefile
    trunk/sys/modules/nfscl/Makefile
    trunk/sys/modules/nfsclient/Makefile
    trunk/sys/modules/nfscommon/Makefile
    trunk/sys/modules/nfsd/Makefile
    trunk/sys/modules/nfslock/Makefile
    trunk/sys/modules/nfslockd/Makefile
    trunk/sys/modules/nfsserver/Makefile
    trunk/sys/modules/nfssvc/Makefile
    trunk/sys/modules/nge/Makefile
    trunk/sys/modules/nmdm/Makefile
    trunk/sys/modules/nsp/Makefile
    trunk/sys/modules/ntfs/Makefile
    trunk/sys/modules/ntfs_iconv/Makefile
    trunk/sys/modules/nullfs/Makefile
    trunk/sys/modules/nvd/Makefile
    trunk/sys/modules/nve/Makefile
    trunk/sys/modules/nvme/Makefile
    trunk/sys/modules/nvram/Makefile
    trunk/sys/modules/nwfs/Makefile
    trunk/sys/modules/nxge/Makefile
    trunk/sys/modules/oce/Makefile
    trunk/sys/modules/opensolaris/Makefile
    trunk/sys/modules/padlock/Makefile
    trunk/sys/modules/patm/Makefile
    trunk/sys/modules/pccard/Makefile
    trunk/sys/modules/pcfclock/Makefile
    trunk/sys/modules/pcn/Makefile
    trunk/sys/modules/pf/Makefile
    trunk/sys/modules/pflog/Makefile
    trunk/sys/modules/pfsync/Makefile
    trunk/sys/modules/plip/Makefile
    trunk/sys/modules/portalfs/Makefile
    trunk/sys/modules/ppbus/Makefile
    trunk/sys/modules/ppc/Makefile
    trunk/sys/modules/ppi/Makefile
    trunk/sys/modules/pps/Makefile
    trunk/sys/modules/procfs/Makefile
    trunk/sys/modules/pseudofs/Makefile
    trunk/sys/modules/pst/Makefile
    trunk/sys/modules/pty/Makefile
    trunk/sys/modules/puc/Makefile
    trunk/sys/modules/qlxgb/Makefile
    trunk/sys/modules/ral/Makefile
    trunk/sys/modules/ralfw/Makefile
    trunk/sys/modules/ralfw/Makefile.inc
    trunk/sys/modules/ralfw/rt2561/Makefile
    trunk/sys/modules/ralfw/rt2561s/Makefile
    trunk/sys/modules/ralfw/rt2661/Makefile
    trunk/sys/modules/ralfw/rt2860/Makefile
    trunk/sys/modules/random/Makefile
    trunk/sys/modules/rc/Makefile
    trunk/sys/modules/rc4/Makefile
    trunk/sys/modules/rdma/Makefile
    trunk/sys/modules/rdma/krping/Makefile
    trunk/sys/modules/re/Makefile
    trunk/sys/modules/reiserfs/Makefile
    trunk/sys/modules/rl/Makefile
    trunk/sys/modules/rndtest/Makefile
    trunk/sys/modules/rp/Makefile
    trunk/sys/modules/runfw/Makefile
    trunk/sys/modules/s3/Makefile
    trunk/sys/modules/safe/Makefile
    trunk/sys/modules/sbni/Makefile
    trunk/sys/modules/scc/Makefile
    trunk/sys/modules/scd/Makefile
    trunk/sys/modules/scsi_low/Makefile
    trunk/sys/modules/sdhci/Makefile
    trunk/sys/modules/sem/Makefile
    trunk/sys/modules/send/Makefile
    trunk/sys/modules/sf/Makefile
    trunk/sys/modules/sfxge/Makefile
    trunk/sys/modules/sge/Makefile
    trunk/sys/modules/siba_bwn/Makefile
    trunk/sys/modules/siftr/Makefile
    trunk/sys/modules/siis/Makefile
    trunk/sys/modules/sio/Makefile
    trunk/sys/modules/sis/Makefile
    trunk/sys/modules/sk/Makefile
    trunk/sys/modules/smbfs/Makefile
    trunk/sys/modules/sn/Makefile
    trunk/sys/modules/snc/Makefile
    trunk/sys/modules/snp/Makefile
    trunk/sys/modules/sound/Makefile
    trunk/sys/modules/sound/Makefile.inc
    trunk/sys/modules/sound/driver/Makefile
    trunk/sys/modules/sound/driver/Makefile.inc
    trunk/sys/modules/sound/driver/ad1816/Makefile
    trunk/sys/modules/sound/driver/ai2s/Makefile
    trunk/sys/modules/sound/driver/als4000/Makefile
    trunk/sys/modules/sound/driver/atiixp/Makefile
    trunk/sys/modules/sound/driver/audiocs/Makefile
    trunk/sys/modules/sound/driver/cmi/Makefile
    trunk/sys/modules/sound/driver/cs4281/Makefile
    trunk/sys/modules/sound/driver/csa/Makefile
    trunk/sys/modules/sound/driver/davbus/Makefile
    trunk/sys/modules/sound/driver/driver/Makefile
    trunk/sys/modules/sound/driver/ds1/Makefile
    trunk/sys/modules/sound/driver/emu10k1/Makefile
    trunk/sys/modules/sound/driver/emu10kx/Makefile
    trunk/sys/modules/sound/driver/envy24/Makefile
    trunk/sys/modules/sound/driver/envy24ht/Makefile
    trunk/sys/modules/sound/driver/es137x/Makefile
    trunk/sys/modules/sound/driver/ess/Makefile
    trunk/sys/modules/sound/driver/fm801/Makefile
    trunk/sys/modules/sound/driver/hda/Makefile
    trunk/sys/modules/sound/driver/hdspe/Makefile
    trunk/sys/modules/sound/driver/ich/Makefile
    trunk/sys/modules/sound/driver/maestro/Makefile
    trunk/sys/modules/sound/driver/maestro3/Makefile
    trunk/sys/modules/sound/driver/mss/Makefile
    trunk/sys/modules/sound/driver/neomagic/Makefile
    trunk/sys/modules/sound/driver/sb16/Makefile
    trunk/sys/modules/sound/driver/sb8/Makefile
    trunk/sys/modules/sound/driver/sbc/Makefile
    trunk/sys/modules/sound/driver/solo/Makefile
    trunk/sys/modules/sound/driver/spicds/Makefile
    trunk/sys/modules/sound/driver/t4dwave/Makefile
    trunk/sys/modules/sound/driver/uaudio/Makefile
    trunk/sys/modules/sound/driver/via8233/Makefile
    trunk/sys/modules/sound/driver/via82c686/Makefile
    trunk/sys/modules/sound/driver/vibes/Makefile
    trunk/sys/modules/sound/sound/Makefile
    trunk/sys/modules/speaker/Makefile
    trunk/sys/modules/splash/Makefile
    trunk/sys/modules/splash/Makefile.inc
    trunk/sys/modules/splash/bmp/Makefile
    trunk/sys/modules/splash/pcx/Makefile
    trunk/sys/modules/splash/txt/Makefile
    trunk/sys/modules/sppp/Makefile
    trunk/sys/modules/ste/Makefile
    trunk/sys/modules/stg/Makefile
    trunk/sys/modules/stge/Makefile
    trunk/sys/modules/streams/Makefile
    trunk/sys/modules/svr4/Makefile
    trunk/sys/modules/svr4/README
    trunk/sys/modules/svr4/TO-DO
    trunk/sys/modules/sym/Makefile
    trunk/sys/modules/syscons/Makefile
    trunk/sys/modules/syscons/Makefile.inc
    trunk/sys/modules/syscons/apm/Makefile
    trunk/sys/modules/syscons/beastie/Makefile
    trunk/sys/modules/syscons/blank/Makefile
    trunk/sys/modules/syscons/daemon/Makefile
    trunk/sys/modules/syscons/dragon/Makefile
    trunk/sys/modules/syscons/fade/Makefile
    trunk/sys/modules/syscons/fire/Makefile
    trunk/sys/modules/syscons/green/Makefile
    trunk/sys/modules/syscons/logo/Makefile
    trunk/sys/modules/syscons/rain/Makefile
    trunk/sys/modules/syscons/snake/Makefile
    trunk/sys/modules/syscons/star/Makefile
    trunk/sys/modules/syscons/warp/Makefile
    trunk/sys/modules/sysvipc/Makefile
    trunk/sys/modules/sysvipc/Makefile.inc
    trunk/sys/modules/sysvipc/sysvmsg/Makefile
    trunk/sys/modules/sysvipc/sysvsem/Makefile
    trunk/sys/modules/sysvipc/sysvshm/Makefile
    trunk/sys/modules/ti/Makefile
    trunk/sys/modules/tl/Makefile
    trunk/sys/modules/tmpfs/Makefile
    trunk/sys/modules/tpm/Makefile
    trunk/sys/modules/trm/Makefile
    trunk/sys/modules/twa/Makefile
    trunk/sys/modules/twe/Makefile
    trunk/sys/modules/tws/Makefile
    trunk/sys/modules/tx/Makefile
    trunk/sys/modules/txp/Makefile
    trunk/sys/modules/uart/Makefile
    trunk/sys/modules/ubsec/Makefile
    trunk/sys/modules/ubser/Makefile
    trunk/sys/modules/uchcom/Makefile
    trunk/sys/modules/ucycom/Makefile
    trunk/sys/modules/udf/Makefile
    trunk/sys/modules/udf_iconv/Makefile
    trunk/sys/modules/ufs/Makefile
    trunk/sys/modules/unionfs/Makefile
    trunk/sys/modules/usb/Makefile
    trunk/sys/modules/usb/at91dci/Makefile
    trunk/sys/modules/usb/atmegadci/Makefile
    trunk/sys/modules/usb/atp/Makefile
    trunk/sys/modules/usb/aue/Makefile
    trunk/sys/modules/usb/avr32dci/Makefile
    trunk/sys/modules/usb/axe/Makefile
    trunk/sys/modules/usb/cdce/Makefile
    trunk/sys/modules/usb/cue/Makefile
    trunk/sys/modules/usb/ehci/Makefile
    trunk/sys/modules/usb/ipheth/Makefile
    trunk/sys/modules/usb/kue/Makefile
    trunk/sys/modules/usb/mos/Makefile
    trunk/sys/modules/usb/musb/Makefile
    trunk/sys/modules/usb/ohci/Makefile
    trunk/sys/modules/usb/quirk/Makefile
    trunk/sys/modules/usb/rue/Makefile
    trunk/sys/modules/usb/rum/Makefile
    trunk/sys/modules/usb/run/Makefile
    trunk/sys/modules/usb/template/Makefile
    trunk/sys/modules/usb/u3g/Makefile
    trunk/sys/modules/usb/uark/Makefile
    trunk/sys/modules/usb/uath/Makefile
    trunk/sys/modules/usb/ubsa/Makefile
    trunk/sys/modules/usb/ubser/Makefile
    trunk/sys/modules/usb/uchcom/Makefile
    trunk/sys/modules/usb/ucom/Makefile
    trunk/sys/modules/usb/ucycom/Makefile
    trunk/sys/modules/usb/udav/Makefile
    trunk/sys/modules/usb/udbp/Makefile
    trunk/sys/modules/usb/uep/Makefile
    trunk/sys/modules/usb/uether/Makefile
    trunk/sys/modules/usb/ufm/Makefile
    trunk/sys/modules/usb/ufoma/Makefile
    trunk/sys/modules/usb/uftdi/Makefile
    trunk/sys/modules/usb/ugensa/Makefile
    trunk/sys/modules/usb/uhci/Makefile
    trunk/sys/modules/usb/uhid/Makefile
    trunk/sys/modules/usb/uhso/Makefile
    trunk/sys/modules/usb/uipaq/Makefile
    trunk/sys/modules/usb/ukbd/Makefile
    trunk/sys/modules/usb/ulpt/Makefile
    trunk/sys/modules/usb/umass/Makefile
    trunk/sys/modules/usb/umcs/Makefile
    trunk/sys/modules/usb/umct/Makefile
    trunk/sys/modules/usb/umodem/Makefile
    trunk/sys/modules/usb/umoscom/Makefile
    trunk/sys/modules/usb/ums/Makefile
    trunk/sys/modules/usb/upgt/Makefile
    trunk/sys/modules/usb/uplcom/Makefile
    trunk/sys/modules/usb/ural/Makefile
    trunk/sys/modules/usb/urio/Makefile
    trunk/sys/modules/usb/urtw/Makefile
    trunk/sys/modules/usb/usb/Makefile
    trunk/sys/modules/usb/usfs/Makefile
    trunk/sys/modules/usb/usie/Makefile
    trunk/sys/modules/usb/uslcom/Makefile
    trunk/sys/modules/usb/uss820dci/Makefile
    trunk/sys/modules/usb/uvisor/Makefile
    trunk/sys/modules/usb/uvscom/Makefile
    trunk/sys/modules/usb/xhci/Makefile
    trunk/sys/modules/usb/zyd/Makefile
    trunk/sys/modules/utopia/Makefile
    trunk/sys/modules/vesa/Makefile
    trunk/sys/modules/vge/Makefile
    trunk/sys/modules/viawd/Makefile
    trunk/sys/modules/virtio/Makefile
    trunk/sys/modules/virtio/balloon/Makefile
    trunk/sys/modules/virtio/block/Makefile
    trunk/sys/modules/virtio/network/Makefile
    trunk/sys/modules/virtio/pci/Makefile
    trunk/sys/modules/virtio/scsi/Makefile
    trunk/sys/modules/virtio/virtio/Makefile
    trunk/sys/modules/vkbd/Makefile
    trunk/sys/modules/vpo/Makefile
    trunk/sys/modules/vr/Makefile
    trunk/sys/modules/vte/Makefile
    trunk/sys/modules/vx/Makefile
    trunk/sys/modules/vxge/Makefile
    trunk/sys/modules/wb/Makefile
    trunk/sys/modules/wbwd/Makefile
    trunk/sys/modules/wlan/Makefile
    trunk/sys/modules/wlan_acl/Makefile
    trunk/sys/modules/wlan_amrr/Makefile
    trunk/sys/modules/wlan_ccmp/Makefile
    trunk/sys/modules/wlan_rssadapt/Makefile
    trunk/sys/modules/wlan_tkip/Makefile
    trunk/sys/modules/wlan_wep/Makefile
    trunk/sys/modules/wlan_xauth/Makefile
    trunk/sys/modules/xfs/Makefile

Added Paths:
-----------
    trunk/sys/modules/usb/uled/
    trunk/sys/modules/usb/uled/Makefile
    trunk/sys/modules/usb/urndis/
    trunk/sys/modules/usb/urndis/Makefile
    trunk/sys/modules/usb/urtwn/
    trunk/sys/modules/usb/urtwn/Makefile
    trunk/sys/modules/usb/urtwnfw/
    trunk/sys/modules/usb/urtwnfw/Makefile
    trunk/sys/modules/usb/urtwnfw/Makefile.inc
    trunk/sys/modules/usb/urtwnfw/urtwnrtl8188eu/
    trunk/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile
    trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cT/
    trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile
    trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cU/
    trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile
    trunk/sys/modules/usb/wsp/
    trunk/sys/modules/usb/wsp/Makefile
    trunk/sys/modules/virtio/console/
    trunk/sys/modules/virtio/console/Makefile
    trunk/sys/modules/virtio/random/
    trunk/sys/modules/virtio/random/Makefile
    trunk/sys/modules/vmm/
    trunk/sys/modules/vmm/Makefile
    trunk/sys/modules/vmware/
    trunk/sys/modules/vmware/Makefile
    trunk/sys/modules/vmware/vmxnet3/
    trunk/sys/modules/vmware/vmxnet3/Makefile

Property Changed:
----------------
    trunk/sys/modules/Makefile.inc
    trunk/sys/modules/aac/Makefile.inc
    trunk/sys/modules/acpi/Makefile.inc
    trunk/sys/modules/aic7xxx/Makefile.inc
    trunk/sys/modules/aic7xxx/ahc/Makefile.inc
    trunk/sys/modules/ata/Makefile.inc
    trunk/sys/modules/ata/atapci/Makefile.inc
    trunk/sys/modules/ata/atapci/chipsets/Makefile.inc
    trunk/sys/modules/bktr/Makefile.inc
    trunk/sys/modules/digi/Makefile
    trunk/sys/modules/digi/Makefile.inc
    trunk/sys/modules/drm/Makefile.inc
    trunk/sys/modules/drm2/Makefile.inc
    trunk/sys/modules/dtrace/Makefile.inc
    trunk/sys/modules/firewire/Makefile.inc
    trunk/sys/modules/geom/Makefile.inc
    trunk/sys/modules/geom/geom_sched/Makefile.inc
    trunk/sys/modules/i2c/Makefile.inc
    trunk/sys/modules/i2c/controllers/Makefile.inc
    trunk/sys/modules/isci/Makefile
    trunk/sys/modules/iwnfw/Makefile.inc
    trunk/sys/modules/libalias/modules/Makefile.inc
    trunk/sys/modules/libalias/modules/modules.inc
    trunk/sys/modules/netgraph/Makefile.inc
    trunk/sys/modules/netgraph/atm/Makefile.inc
    trunk/sys/modules/netgraph/bluetooth/Makefile.inc
    trunk/sys/modules/ralfw/Makefile.inc
    trunk/sys/modules/sound/Makefile.inc
    trunk/sys/modules/sound/driver/Makefile.inc
    trunk/sys/modules/sound/driver/ich/Makefile
    trunk/sys/modules/splash/Makefile.inc
    trunk/sys/modules/svr4/README
    trunk/sys/modules/svr4/TO-DO
    trunk/sys/modules/syscons/Makefile.inc
    trunk/sys/modules/sysvipc/Makefile.inc

Modified: trunk/sys/modules/3dfx/Makefile
===================================================================
--- trunk/sys/modules/3dfx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/3dfx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/3dfx/Makefile 241828 2012-10-22 02:12:11Z eadler $
 
 .PATH: $(.CURDIR)/../../dev/tdfx
 

Modified: trunk/sys/modules/3dfx_linux/Makefile
===================================================================
--- trunk/sys/modules/3dfx_linux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/3dfx_linux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/3dfx_linux/Makefile,v 1.1.2.1 2006/03/09 21:51:00 yar Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/3dfx_linux/Makefile 156260 2006-03-03 21:37:38Z yar $
 
 .PATH: ${.CURDIR}/../../dev/tdfx
 

Modified: trunk/sys/modules/Makefile
===================================================================
--- trunk/sys/modules/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,10 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.450.2.9 2006/02/13 11:39:01 marius Exp $
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/Makefile 334096 2018-05-23 13:59:37Z emaste $
 
 .include <bsd.own.mk>
 
+SUBDIR_PARALLEL=
+
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
@@ -10,9 +12,12 @@
 	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
+	${_aacraid} \
 	accf_data \
 	accf_dns \
 	accf_http \
+	acl_nfs4 \
+	acl_posix1e \
 	${_acpi} \
 	ae \
 	${_aesni} \
@@ -27,7 +32,6 @@
 	alc \
 	ale \
 	alq \
-	${_amd} \
 	${_amdsbwd} \
 	${_amdtemp} \
 	amr \
@@ -41,6 +45,7 @@
 	ata \
 	ath \
 	ath_pci \
+	${_autofs} \
 	${_auxio} \
 	${_bce} \
 	bfe \
@@ -56,6 +61,7 @@
 	${_canbepm} \
 	${_canbus} \
 	${_cardbus} \
+	${_carp} \
 	cas \
 	${_cbb} \
 	cc \
@@ -62,23 +68,24 @@
 	cd9660 \
 	cd9660_iconv \
 	${_ce} \
+	${_cfi} \
 	${_ciss} \
 	${_cm} \
 	${_cmx} \
-	coda \
-	coda5 \
 	${_coff} \
 	${_coretemp} \
 	${_cp} \
+	${_cpsw} \
 	${_cpuctl} \
 	${_cpufreq} \
 	${_crypto} \
 	${_cryptodev} \
 	${_cs} \
+	${_ct} \
 	${_ctau} \
+	ctl \
 	${_cxgb} \
-	cxgbe \
-	${_cyclic} \
+	${_cxgbe} \
 	dc \
 	dcons \
 	dcons_crom \
@@ -104,9 +111,10 @@
 	fdc \
 	fdescfs \
 	${_fe} \
-	${_filemon} \
+	filemon \
 	firewire \
 	firmware \
+	fuse \
 	${_fxp} \
 	gem \
 	geom \
@@ -118,22 +126,25 @@
 	${_hpt27xx} \
 	${_hptiop} \
 	${_hptmv} \
+	${_hptnr} \
 	${_hptrr} \
 	hwpmc \
+	${_hyperv} \
 	${_i2c} \
+        ${_ibcore} \
 	${_ibcs2} \
 	${_ichwd} \
 	${_ida} \
 	${_ie} \
 	if_bridge \
-	${_if_carp} \
 	if_disc \
 	if_edsc \
 	if_ef \
 	if_epair \
 	if_faith \
-	if_gif \
+	${_if_gif} \
 	${_if_gre} \
+	${_if_me} \
 	if_lagg \
 	${_if_ndis} \
 	if_stf \
@@ -140,10 +151,14 @@
 	if_tap \
 	if_tun \
 	if_vlan \
+	if_vxlan \
 	${_igb} \
 	${_iir} \
+	${_imgact_binmisc} \
 	${_io} \
-	ipdivert \
+	${_ioat} \
+        ${_ipoib} \
+	${_ipdivert} \
 	${_ipfilter} \
 	${_ipfw} \
 	ipfw_nat \
@@ -154,16 +169,18 @@
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
-	iscsi \
 	isp \
 	${_ispfw} \
-	${_it} \
 	${_iwi} \
 	${_iwifw} \
 	${_iwn} \
 	${_iwnfw} \
+	${_ix} \
+	${_ixv} \
 	${_ixgb} \
 	${_ixgbe} \
+	${_ixl} \
+	${_ixlv} \
 	jme \
 	joy \
 	kbdmux \
@@ -178,10 +195,12 @@
 	libiconv \
 	libmbpool \
 	libmchain \
+	${_lindev} \
 	${_linprocfs} \
 	${_linsysfs} \
 	${_linux} \
-	${_lm} \
+	${_linux_common} \
+	${_linux64} \
 	lmc \
 	lpt \
 	mac_biba \
@@ -205,12 +224,17 @@
 	${_mlx4} \
 	${_mlx4ib} \
 	${_mlxen} \
+	${_mlx5} \
+	${_mlx5en} \
+	${_mlx5ib} \
 	${_mly} \
 	mmc \
 	mmcsd \
+	mpr \
 	mps \
 	mpt \
 	mqueue \
+	mrsas \
 	msdosfs \
 	msdosfs_iconv \
 	${_mse} \
@@ -221,9 +245,12 @@
 	${_mwlfw} \
 	mxge \
 	my \
+	${_nandfs} \
+	${_nandsim} \
 	${_ncp} \
 	${_ncv} \
 	${_ndis} \
+	netfpga10g \
 	${_netgraph} \
 	${_nfe} \
 	nfs_common \
@@ -238,14 +265,12 @@
 	nge \
 	nmdm \
 	${_nsp} \
-	ntfs \
-	ntfs_iconv \
 	nullfs \
-	nvd \
+	${_ntb} \
+	${_nvd} \
 	${_nve} \
-	nvme \
+	${_nvme} \
 	${_nvram} \
-	${_nwfs} \
 	${_nxge} \
 	${_opensolaris} \
 	oce \
@@ -258,7 +283,8 @@
 	${_pflog} \
 	${_pfsync} \
 	plip \
-	portalfs \
+	${_pmc} \
+	${_pms} \
 	ppbus \
 	ppc \
 	ppi \
@@ -268,7 +294,10 @@
 	${_pst} \
 	pty  \
 	puc \
+	${_qlxge} \
 	${_qlxgb} \
+	${_qlxgbe} \
+	${_qlnx} \
 	ral \
 	${_ralfw} \
 	${_random} \
@@ -277,7 +306,6 @@
 	re \
 	reiserfs \
 	rl \
-	${_runfw} \
 	${_s3} \
 	${_safe} \
 	${_sbni} \
@@ -285,6 +313,8 @@
 	scd \
 	${_scsi_low} \
 	sdhci \
+	${_sdhci_acpi} \
+	sdhci_pci \
 	sem \
 	send \
 	${_sf} \
@@ -314,6 +344,7 @@
 	${_ti} \
 	tl \
 	tmpfs \
+	${_toecore} \
 	${_tpm} \
 	trm \
 	${_twa} \
@@ -334,6 +365,8 @@
 	vge \
 	${_viawd} \
 	vkbd \
+	${_vmm} \
+	${_vmware} \
 	${_vpo} \
 	vr \
 	vte \
@@ -354,13 +387,13 @@
 	${_wpifw} \
 	${_x86bios} \
 	${_xe} \
-	xfs \
 	xl \
 	${_zfs} \
 	zlib \
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-_filemon=	filemon
+_imgact_binmisc=	imgact_binmisc
+_vmware=	vmware
 .endif
 
 .if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
@@ -379,6 +412,16 @@
 .endif
 .endif
 
+.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
+	${MACHINE_ARCH:C/mips(el)?/mips/} != "mips" && \
+	${MACHINE_ARCH} != "powerpc"
+_cxgbe=		cxgbe
+.endif
+
+.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
+_autofs=	autofs
+.endif
+
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${.CURDIR}/../opencrypto)
 _crypto=	crypto
@@ -389,13 +432,16 @@
 .endif
 .endif
 
-.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
+.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
+	defined(ALL_MODULES)
+_carp=	carp
+_toecore=	toecore
+_if_gif=	if_gif
 _if_gre=	if_gre
 .endif
 
-.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
-	defined(ALL_MODULES)
-_if_carp=	if_carp
+.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
+_if_me=		if_me
 .endif
 
 .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
@@ -403,9 +449,20 @@
 .endif
 
 .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
+_ipdivert=	ipdivert
 _ipfw=		ipfw
 .endif
 
+.if ${MK_ISCSI} != "no" || defined(ALL_MODULES)
+SUBDIR+=	iscsi
+SUBDIR+=	iscsi_initiator
+.endif
+
+.if ${MK_NAND} != "no" || defined(ALL_MODULES)
+_nandfs=	nandfs
+_nandsim=	nandsim
+.endif
+
 .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
 _netgraph=	netgraph
 .endif
@@ -426,7 +483,6 @@
 _ispfw=		ispfw
 _mwlfw=		mwlfw
 _ralfw=		ralfw
-_runfw=		runfw
 _sf=		sf
 _sn=		sn
 _ti=		ti
@@ -440,13 +496,14 @@
 _3dfx_linux=	3dfx_linux
 _agp=		agp
 _aic=		aic
-_amd=		amd
 _an=		an
 _aout=		aout
 _apm=		apm
 _arcnet=	arcnet
 _bktr=		bktr
+.if ${MK_SOURCELESS_UCODE} != "no"
 _bxe=		bxe
+.endif
 _cardbus=	cardbus
 _cbb=		cbb
 .if ${MK_SOURCELESS_UCODE} != "no"
@@ -459,9 +516,6 @@
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _cs=		cs
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_cyclic=	cyclic
-.endif
 _dpms=		dpms
 _drm=		drm
 _drm2=		drm2
@@ -479,11 +533,18 @@
 _glxiic=	glxiic
 _glxsb=		glxsb
 _i2c=		i2c
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+_ibcore=        ibcore
+.endif
 _ibcs2=		ibcs2
 _ie=		ie
 _if_ndis=	if_ndis
 _igb=		igb
 _io=		io
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+_ipoib=         ipoib
+.endif
+_lindev=	lindev
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
@@ -494,15 +555,14 @@
 _mlxen=		mlxen
 _mthca=		mthca
 .endif
-.if ${MK_NCP} != "no"
-_ncp=		ncp
+_mlx5=		mlx5
+.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
+	defined(ALL_MODULES)
+_mlx5en=	mlx5en
 .endif
 _ncv=		ncv
 _ndis=		ndis
 _nsp=		nsp
-.if ${MK_NCP} != "no"
-_nwfs=		nwfs
-.endif
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
 .endif
@@ -530,6 +590,7 @@
 .endif
 .if ${MACHINE} == "i386"
 _aac=		aac
+_aacraid=	aacraid
 _acpi=		acpi
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _aesni=		aesni
@@ -556,8 +617,10 @@
 _hptiop=	hptiop
 .if ${MK_SOURCELESS_HOST} != "no"
 _hptmv=		hptmv
+_hptnr=		hptnr
 _hptrr=		hptrr
 .endif
+_hyperv=	hyperv
 _ichwd=		ichwd
 _ida=		ida
 _iir=		iir
@@ -576,13 +639,17 @@
 .if ${MK_SOURCELESS_UCODE} != "no"
 _iwnfw=		iwnfw
 .endif
+_ix=		ix
+_ixv=		ixv
 _ixgb=		ixgb
 _ixgbe=		ixgbe
 _mly=		mly
 _nfe=		nfe
+_nvd=		nvd
 .if ${MK_SOURCELESS_HOST} != "no"
 _nve=		nve
 .endif
+_nvme=		nvme
 _nvram=		nvram
 _nxge=		nxge
 _tpm=		tpm
@@ -595,15 +662,23 @@
 _padlock=	padlock
 .endif
 _s3=		s3
+_sdhci_acpi=	sdhci_acpi
 _twa=		twa
 _vesa=		vesa
 _virtio=	virtio
 _x86bios=	x86bios
+.elif ${MACHINE} == "pc98"
+_canbepm=	canbepm
+_canbus=	canbus
+_ct=		ct
+_pmc=		pmc
+_snc=		snc
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _aac=		aac
+_aacraid=	aacraid
 _aout=		aout
 _acpi=		acpi
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
@@ -615,6 +690,8 @@
 _amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _asmc=		asmc
+_bios=		bios
+_bktr=		bktr
 _bxe=		bxe
 _cardbus=	cardbus
 _cbb=		cbb
@@ -623,9 +700,6 @@
 _coretemp=	coretemp
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_cyclic=	cyclic
-.endif
 _dpms=		dpms
 _drm=		drm
 _drm2=		drm2
@@ -643,9 +717,14 @@
 _hptiop=	hptiop
 .if ${MK_SOURCELESS_HOST} != "no"
 _hptmv=		hptmv
+_hptnr=		hptnr
 _hptrr=		hptrr
 .endif
+_hyperv=	hyperv
 _i2c=		i2c
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+_ibcore=        ibcore
+.endif
 _ichwd=		ichwd
 _ida=		ida
 _if_ndis=	if_ndis
@@ -652,13 +731,16 @@
 _igb=		igb
 _iir=		iir
 _io=		io
+_ioat=		ioat
 _ipmi=		ipmi
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+_ipoib=         ipoib
+.endif
 _ips=		ips
 _ipw=		ipw
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
 .endif
-_it=		it
 _isci=		isci
 _iwi=		iwi
 .if ${MK_SOURCELESS_UCODE} != "no"
@@ -668,24 +750,39 @@
 .if ${MK_SOURCELESS_UCODE} != "no"
 _iwnfw=		iwnfw
 .endif
+_ix=		ix
+_ixv=		ixv
 _ixgb=		ixgb
 _ixgbe=		ixgbe
+_ixl=		ixl
+_ixlv=		ixlv
+_lindev=	lindev
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
-_lm=		lm
+_linux64=	linux64
+_linux_common=	linux_common
 _mly=		mly
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mlx4=		mlx4
 _mlx4ib=	mlx4ib
+_mlx5ib=	mlx5ib
 _mlxen=		mlxen
 _mthca=		mthca
 .endif
+_mlx5=		mlx5
+.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
+	defined(ALL_MODULES)
+_mlx5en=	mlx5en
+.endif
 _ndis=		ndis
 _nfe=		nfe
+_ntb=		ntb
+_nvd=		nvd
 .if ${MK_SOURCELESS_HOST} != "no"
 _nve=		nve
 .endif
+_nvme=		nvme
 _nvram=		nvram
 _nxge=		nxge
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
@@ -695,8 +792,14 @@
 _padlock=	padlock
 .endif
 _pccard=	pccard
+_pms=		pms
+_qlxge=		qlxge
 _qlxgb=		qlxgb
-_rdma=		rdma	
+.if ${MK_SOURCELESS_UCODE} != "no"
+_qlxgbe=	qlxgbe
+.endif
+_qlnx=		qlnx
+_rdma=		rdma
 _s3=		s3
 _safe=		safe
 _scsi_low=	scsi_low
@@ -711,6 +814,9 @@
 _vesa=		vesa
 _viawd=		viawd
 _virtio=	virtio
+.if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
+_vmm=		vmm
+.endif
 _vxge=  	vxge
 _x86bios=	x86bios
 _wbwd=		wbwd
@@ -724,10 +830,104 @@
 .endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "arm"
+_cfi=		cfi
+_cpsw=		cpsw
+.endif
+
+.if ${MACHINE_CPUARCH} == "ia64"
+_aac=		aac
+_aacraid=	aacraid
+_aic=		aic
+_an=		an
+_arcnet=	arcnet
+_asr=		asr
+_bktr=		bktr
+_cardbus=	cardbus
+_cbb=		cbb
+_ciss=		ciss
+_cm=		cm
+_cmx=		cmx
+_coff=		coff
+_cpufreq=	cpufreq
+_dpt=		dpt
+_em=		em
+_ep=		ep
+_et=		et
+_exca=		exca
+_fe=		fe
+_hptiop=	hptiop
+_ida=		ida
+_igb=		igb
+_iir=		iir
+_ips=		ips
+_mly=		mly
+_pccard=	pccard
+_scsi_low=	scsi_low
+_smbfs=		smbfs
+_sound=		sound
+_splash=	splash
+_sppp=		sppp
+_streams=	streams
+_tpm=		tpm
+_twa=		twa
+_wi=		wi
+_xe=		xe
+.endif
+
+.if ${MACHINE_CPUARCH} == "powerpc"
+_agp=		agp
+_an=		an
+_bm=		bm
+_cardbus=	cardbus
+_cbb=		cbb
+_cfi=		cfi
+_cpufreq=	cpufreq
+_drm=		drm
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_dtrace=	dtrace
+.endif
+_exca=		exca
+_nvram=		powermac_nvram
+_pccard=	pccard
+_smbfs=		smbfs
+_sound=		sound
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_opensolaris=	opensolaris
+.endif
+_wi=		wi
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc64"
+_drm2=		drm2
+_i2c=		i2c
+.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
+_zfs=		zfs
+.endif
+.endif
+
+.if ${MACHINE_CPUARCH} == "sparc64"
+_auxio=		auxio
+_em=		em
+_epic=		epic
+_i2c=		i2c
+_igb=		igb
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_opensolaris=	opensolaris
+.endif
+_smbfs=		smbfs
+_sound=		sound
+.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
+_zfs=		zfs
+.endif
+.endif
+
 .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
 SUBDIR=${MODULES_OVERRIDE}
 .endif
 
+SUBDIR+=${MODULES_EXTRA}
+
 .for reject in ${WITHOUT_MODULES}
 SUBDIR:= ${SUBDIR:N${reject}}
 .endfor

Modified: trunk/sys/modules/Makefile.inc
===================================================================
--- trunk/sys/modules/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$ 
+# $FreeBSD: stable/10/sys/modules/Makefile.inc 291811 2015-12-04 18:44:12Z bdrewery $
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
 .endif
 
+SUBDIR_PARALLEL=	yes


Property changes on: trunk/sys/modules/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/aac/Makefile
===================================================================
--- trunk/sys/modules/aac/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aac/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/aac/Makefile 331637 2018-03-27 17:52:52Z brooks $
 
 .PATH: ${.CURDIR}/../../dev/aac
 
@@ -8,7 +9,7 @@
 
 KMOD=	aac
 SRCS=	aac.c aac_pci.c aac_disk.c aac_cam.c
-SRCS+=	opt_scsi.h opt_cam.h opt_aac.h
+SRCS+=	opt_scsi.h opt_cam.h opt_compat.h opt_aac.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 # To enable debug output from the driver, uncomment these two lines.

Modified: trunk/sys/modules/aac/Makefile.inc
===================================================================
--- trunk/sys/modules/aac/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aac/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/aac/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/aac/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/aac/aac_linux/Makefile
===================================================================
--- trunk/sys/modules/aac/aac_linux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aac/aac_linux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/aac/aac_linux/Makefile 103952 2002-09-25 05:00:25Z scottl $
 
 .PATH: ${.CURDIR}/../../../dev/aac
 

Modified: trunk/sys/modules/accf_data/Makefile
===================================================================
--- trunk/sys/modules/accf_data/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/accf_data/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/accf_data/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH: ${.CURDIR}/../../netinet
 

Modified: trunk/sys/modules/accf_dns/Makefile
===================================================================
--- trunk/sys/modules/accf_dns/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/accf_dns/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/accf_dns/Makefile 180593 2008-07-18 14:44:51Z dwmalone $
 
 .PATH: ${.CURDIR}/../../netinet
 

Modified: trunk/sys/modules/accf_http/Makefile
===================================================================
--- trunk/sys/modules/accf_http/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/accf_http/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/accf_http/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH: ${.CURDIR}/../../netinet
 

Modified: trunk/sys/modules/acpi/Makefile
===================================================================
--- trunk/sys/modules/acpi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/Makefile 237981 2012-07-02 08:31:29Z mav $
 
-SUBDIR=		acpi_asus acpi_fujitsu acpi_hp acpi_ibm	\
+SUBDIR=		acpi_asus acpi_asus_wmi acpi_fujitsu acpi_hp acpi_ibm	\
 		acpi_panasonic acpi_sony acpi_toshiba acpi_video	\
 		acpi_dock acpi_wmi aibs
 

Modified: trunk/sys/modules/acpi/Makefile.inc
===================================================================
--- trunk/sys/modules/acpi/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $MidnightBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/acpi/Makefile.inc 124476 2004-01-13 13:08:27Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/acpi/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/acpi/acpi/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,24 +1,29 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi/Makefile 250838 2013-05-20 23:52:49Z jkim $
 
 .if !defined(FORCE_BUILD)
 .error "The ACPI module is deprecated, set FORCE_BUILD to force it"
 .endif
 
+.if ${MACHINE_CPUARCH} == "ia64"
+.error "ACPI can only be compiled into the kernel on the ia64 platform"
+.endif
+
 .if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
 .error "The ACPI module is only for amd64 and i386"
 .endif
 
-.PATH:	${.CURDIR}/../../../contrib/dev/acpica/debugger \
-	${.CURDIR}/../../../contrib/dev/acpica/disassembler \
-	${.CURDIR}/../../../contrib/dev/acpica/dispatcher \
-	${.CURDIR}/../../../contrib/dev/acpica/events \
-	${.CURDIR}/../../../contrib/dev/acpica/executer \
-	${.CURDIR}/../../../contrib/dev/acpica/hardware \
-	${.CURDIR}/../../../contrib/dev/acpica/namespace \
-	${.CURDIR}/../../../contrib/dev/acpica/parser \
-	${.CURDIR}/../../../contrib/dev/acpica/resources \
-	${.CURDIR}/../../../contrib/dev/acpica/tables \
-	${.CURDIR}/../../../contrib/dev/acpica/utilities \
+.PATH:	${.CURDIR}/../../../contrib/dev/acpica/components/debugger \
+	${.CURDIR}/../../../contrib/dev/acpica/components/disassembler \
+	${.CURDIR}/../../../contrib/dev/acpica/components/dispatcher \
+	${.CURDIR}/../../../contrib/dev/acpica/components/events \
+	${.CURDIR}/../../../contrib/dev/acpica/components/executer \
+	${.CURDIR}/../../../contrib/dev/acpica/components/hardware \
+	${.CURDIR}/../../../contrib/dev/acpica/components/namespace \
+	${.CURDIR}/../../../contrib/dev/acpica/components/parser \
+	${.CURDIR}/../../../contrib/dev/acpica/components/resources \
+	${.CURDIR}/../../../contrib/dev/acpica/components/tables \
+	${.CURDIR}/../../../contrib/dev/acpica/components/utilities \
 	${.CURDIR}/../../../pci \
 	${.CURDIR}/../../../dev/acpica \
 	${.CURDIR}/../../../dev/acpica/Osd \
@@ -28,32 +33,38 @@
 KMOD=	acpi
 
 # ACPI CA sources
-SRCS+=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbmethod.c
-SRCS+=	dbnames.c dbstats.c dbutils.c dbxface.c
-SRCS+=	dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c
-SRCS+=	dmresrcs.c dmutils.c dmwalk.c
+SRCS=	dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c dbhistry.c
+SRCS+=	dbinput.c dbmethod.c dbnames.c dbstats.c dbutils.c dbxface.c
+SRCS+=	dmbuffer.c dmdeferred.c dmnames.c dmopcode.c dmobject.c dmresrc.c
+SRCS+=	dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c
 SRCS+=	dsargs.c dscontrol.c dsfield.c dsinit.c dsmethod.c dsmthdat.c
 SRCS+=	dsobject.c dsopcode.c dsutils.c dswexec.c dswload.c dswload2.c
 SRCS+=	dswscope.c dswstate.c
-SRCS+=	evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c evgpeutil.c evmisc.c
-SRCS+=	evregion.c evrgnini.c evsci.c evxface.c evxfevnt.c evxfgpe.c evxfregn.c
+SRCS+=	evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c evgpeutil.c
+SRCS+=	evhandler.c evmisc.c evregion.c evrgnini.c evsci.c evxface.c
+SRCS+=	evxfevnt.c evxfgpe.c evxfregn.c
 SRCS+=	exconfig.c exconvrt.c excreate.c exdebug.c exdump.c exfield.c
 SRCS+=	exfldio.c exmisc.c exmutex.c exnames.c exoparg1.c exoparg2.c
 SRCS+=	exoparg3.c exoparg6.c exprep.c exregion.c exresnte.c exresolv.c
 SRCS+=	exresop.c exstore.c exstoren.c exstorob.c exsystem.c exutils.c
-SRCS+=	hwacpi.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwtimer.c hwvalid.c
-SRCS+=	hwxface.c
-SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c nsnames.c
-SRCS+=	nsobject.c nsparse.c nspredef.c nsrepair.c nsrepair2.c nssearch.c
-SRCS+=	nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
-SRCS+=	psargs.c psloop.c psopcode.c psparse.c psscope.c pstree.c psutils.c
-SRCS+=	pswalk.c psxface.c
-SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c rsirq.c rslist.c
-SRCS+=	rsmemory.c rsmisc.c rsutils.c rsxface.c
-SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c tbxfroot.c
-SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdecode.c utdelete.c uteval.c
-SRCS+=	utglobal.c utids.c utinit.c utlock.c utmath.c utmisc.c utmutex.c
-SRCS+=	utobject.c utosi.c utresrc.c utstate.c utxface.c utxferror.c
+SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwtimer.c
+SRCS+=	hwvalid.c hwxface.c hwxfsleep.c
+SRCS+=	nsaccess.c nsalloc.c nsarguments.c nsconvert.c nsdump.c nseval.c
+SRCS+=	nsinit.c nsload.c nsnames.c nsobject.c nsparse.c nspredef.c nsprepkg.c
+SRCS+=	nsrepair.c nsrepair2.c nssearch.c nsutils.c nswalk.c nsxfeval.c
+SRCS+=	nsxfname.c nsxfobj.c
+SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c psparse.c
+SRCS+=	psscope.c pstree.c psutils.c pswalk.c psxface.c
+SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c rsinfo.c rsio.c
+SRCS+=	rsirq.c rslist.c rsmemory.c rsmisc.c rsserial.c rsutils.c rsxface.c
+SRCS+=	tbfadt.c tbfind.c tbinstal.c tbprint.c tbutils.c tbxface.c tbxfload.c
+SRCS+=	tbxfroot.c
+SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c utdebug.c
+SRCS+=	utdecode.c utdelete.c uterror.c uteval.c utexcep.c utglobal.c utids.c
+SRCS+=	utinit.c utlock.c utmath.c utmisc.c utmutex.c utobject.c utosi.c
+SRCS+=	utownerid.c utpredef.c utresrc.c utstate.c utstring.c utxface.c
+SRCS+=	utxferror.c utxfinit.c
+#SRCS+=	utxfmutex.c
 
 # OSPM layer and core hardware drivers
 SRCS+=	acpi.c acpi_button.c acpi_isab.c acpi_package.c acpi_pci.c acpi_pcib.c
@@ -80,6 +91,9 @@
 .if KTR
 CFLAGS+=-DKTR
 .endif
+.if SMP
+CFLAGS+=-DSMP
+.endif
 .if ACPI_MAX_TASKS
 CFLAGS+=-DACPI_MAX_TASKS=${ACPI_MAX_TASKS}
 .endif
@@ -103,20 +117,11 @@
 
 SRCS+=	opt_global.h
 
-ASM_CFLAGS=	-x assembler-with-cpp -DLOCORE ${CFLAGS}
-NORMAL_S=	${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}
-NM?=		nm
+.include <bsd.kmod.mk>
 
-.if ${MACHINE_CPUARCH} == "amd64"
-.if !defined(KERNBUILDDIR)
-CFLAGS+=-DSMP
-.endif
-SRCS+=	acpi_switch.S
-acpi_switch.o:	acpi_switch.S
-	${NORMAL_S}
-.endif
 acpi_wakecode.o: acpi_wakecode.S assym.s
-	${NORMAL_S}
+	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} ${CLANG_NO_IAS} \
+	    ${WERROR} ${.IMPSRC}
 acpi_wakecode.bin: acpi_wakecode.o
 	objcopy -S -O binary acpi_wakecode.o ${.TARGET}
 acpi_wakecode.h: acpi_wakecode.bin
@@ -127,5 +132,3 @@
 	    while read offset dummy what; do \
 	    echo "#define	$${what}	0x$${offset}"; \
 	    done > ${.TARGET}
-
-.include <bsd.kmod.mk>

Modified: trunk/sys/modules/acpi/acpi_asus/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_asus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_asus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_asus/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/acpi/acpi_dock/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_dock/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_dock/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_dock/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:		${.CURDIR}/../../../dev/acpica
 KMOD=		acpi_dock

Modified: trunk/sys/modules/acpi/acpi_fujitsu/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_fujitsu/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_fujitsu/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_fujitsu/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/acpi/acpi_hp/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_hp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_hp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_hp/Makefile 194701 2009-06-23 13:17:25Z rpaulo $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/acpi/acpi_ibm/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_ibm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_ibm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_ibm/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 KMOD=		acpi_ibm

Modified: trunk/sys/modules/acpi/acpi_panasonic/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_panasonic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_panasonic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_panasonic/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/acpi/acpi_sony/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_sony/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_sony/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_sony/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/acpi/acpi_toshiba/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_toshiba/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_toshiba/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_toshiba/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/acpi/acpi_video/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_video/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_video/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-#	$FreeBSD$
+# $MidnightBSD$
+#	$FreeBSD: stable/10/sys/modules/acpi/acpi_video/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 .PATH:	${.CURDIR}/../../../dev/acpica
 

Modified: trunk/sys/modules/acpi/acpi_wmi/Makefile
===================================================================
--- trunk/sys/modules/acpi/acpi_wmi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/acpi_wmi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/acpi_wmi/Makefile 194701 2009-06-23 13:17:25Z rpaulo $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/acpi/aibs/Makefile
===================================================================
--- trunk/sys/modules/acpi/aibs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/acpi/aibs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/acpi/aibs/Makefile 209523 2010-06-25 15:32:46Z rpaulo $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 

Modified: trunk/sys/modules/ae/Makefile
===================================================================
--- trunk/sys/modules/ae/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ae/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ae/Makefile 185571 2008-12-02 21:37:28Z bz $
 
 .PATH: ${.CURDIR}/../../dev/ae
 

Modified: trunk/sys/modules/aesni/Makefile
===================================================================
--- trunk/sys/modules/aesni/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aesni/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,20 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/aesni/Makefile 255452 2013-09-10 16:50:13Z obrien $
 
 .PATH: ${.CURDIR}/../../crypto/aesni
 
 KMOD=	aesni
-SRCS=	aesni.c aesni_wrap.c
-SRCS+=	aesencdec_${MACHINE_CPUARCH}.S aeskeys_${MACHINE_CPUARCH}.S
+SRCS=	aesni.c
+SRCS+=	aeskeys_${MACHINE_CPUARCH}.S
 SRCS+=	device_if.h bus_if.h opt_bus.h cryptodev_if.h
 
+OBJS+=	aesni_wrap.o
+
+# Remove -nostdinc so we can get the intrinsics.
+aesni_wrap.o: aesni_wrap.c
+	${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} \
+	     -mmmx -msse -maes ${.IMPSRC}
+	${CTFCONVERT_CMD}
+
 .include <bsd.kmod.mk>
+

Modified: trunk/sys/modules/age/Makefile
===================================================================
--- trunk/sys/modules/age/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/age/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/age/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/age/Makefile 179101 2008-05-19 01:53:47Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/age
 

Modified: trunk/sys/modules/agp/Makefile
===================================================================
--- trunk/sys/modules/agp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/agp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/agp/Makefile 243100 2012-11-15 20:25:09Z eadler $
 
 .PATH: ${.CURDIR}/../../dev/agp
 
@@ -18,7 +19,7 @@
 SRCS+=  agp_apple.c
 .endif
 SRCS+=	device_if.h bus_if.h agp_if.h pci_if.h
-SRCS+=	opt_agp.h opt_bus.h
+SRCS+=	opt_agp.h
 MFILES=	kern/device_if.m kern/bus_if.m dev/agp/agp_if.m dev/pci/pci_if.m
 WERROR=
 

Modified: trunk/sys/modules/aha/Makefile
===================================================================
--- trunk/sys/modules/aha/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aha/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/modules/aha/Makefile,v 1.2 2009/03/15 14:13:04 laffer1 Exp $
-# $FreeBSD: src/sys/modules/aha/Makefile,v 1.8.14.1 2006/02/10 00:37:58 yar Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/aha/Makefile 217070 2011-01-06 21:04:00Z imp $
 
 .PATH: ${.CURDIR}/../../dev/aha
 

Modified: trunk/sys/modules/ahb/Makefile
===================================================================
--- trunk/sys/modules/ahb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ahb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ahb/Makefile 217070 2011-01-06 21:04:00Z imp $
 
 .PATH: ${.CURDIR}/../../dev/ahb
 

Modified: trunk/sys/modules/ahci/Makefile
===================================================================
--- trunk/sys/modules/ahci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ahci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ahci/Makefile 279918 2015-03-12 13:40:02Z mav $
 
 .PATH: ${.CURDIR}/../../dev/ahci
 
 KMOD=	ahci
-SRCS=	ahci.c ahci.h device_if.h bus_if.h pci_if.h opt_cam.h
+SRCS=	ahci.c ahci_pci.c ahciem.c ahci.h device_if.h bus_if.h pci_if.h opt_cam.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/aic/Makefile
===================================================================
--- trunk/sys/modules/aic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/aic/Makefile,v 1.6 2004/05/26 00:53:00 imp Exp $
+# $FreeBSD: stable/10/sys/modules/aic/Makefile 129740 2004-05-26 00:53:10Z imp $
 
 .PATH: ${.CURDIR}/../../dev/aic
 
@@ -7,6 +7,11 @@
 SRCS=	aic.c aic_pccard.c
 SRCS+=	device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
 SRCS+=	opt_cam.h opt_scsi.h
+
+.if ${MACHINE} == "pc98"
+SRCS+=	aic_cbus.c
+.else
 SRCS+=	aic_isa.c
+.endif
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/aic7xxx/Makefile
===================================================================
--- trunk/sys/modules/aic7xxx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,23 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/aic7xxx/Makefile 270284 2014-08-21 17:18:21Z ian $
 
-SUBDIR= aicasm ahc ahd
+SUBDIR= ahc ahd
 
+firmware: aicasm/aicasm ahdfirmware ahcfirmware
+
+aicasm/aicasm:
+	( cd ${.CURDIR}/aicasm ; ${MAKE} aicasm )
+
+ahdfirmware:
+	( cd ${.CURDIR}/ahd ; ${MAKE} ahdfirmware )
+
+ahcfirmware:
+	( cd ${.CURDIR}/ahc ; ${MAKE} ahcfirmware )
+
+cleanfirmware:
+	( cd .${CURDIR}/aicasm ; ${MAKE} clean )
+	( cd .${CURDIR}/ahc ; ${MAKE} cleanfirmware )
+	( cd .${CURDIR}/ahd ; ${MAKE} cleanfirmware )
+
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/aic7xxx/Makefile.inc
===================================================================
--- trunk/sys/modules/aic7xxx/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/aic7xxx/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/aic7xxx/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/aic7xxx/ahc/Makefile
===================================================================
--- trunk/sys/modules/aic7xxx/ahc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/ahc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/aic7xxx/ahc/Makefile 270284 2014-08-21 17:18:21Z ian $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahc
@@ -15,12 +16,14 @@
 .endif
 BEFORE_DEPEND = ${GENSRCS}
 
-../aicasm/aicasm: ${.CURDIR}/../../../dev/aci7xxx/aicasm/*.[chyl]
+../aicasm/aicasm: ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
 	( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
 
+.if make(ahcfirmware)
+ahcfirmware: ${GENSRCS}
 ${GENSRCS}:								 \
 		${.CURDIR}/../../../dev/aic7xxx/aic7xxx.{reg,seq}	 \
-		${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
+		${.CURDIR}/../../../cam/scsi/scsi_message.h 
 	../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
 			-I${.CURDIR}/../../../dev/aic7xxx		 \
 			-o aic7xxx_seq.h -r aic7xxx_reg.h		 \
@@ -27,12 +30,20 @@
 			${REG_PRINT_OPT}				 \
 			-i ${.CURDIR}/../../../dev/aic7xxx/aic7xxx_osm.h \
 			${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq
+.else
+${GENSRCS}:
+	@echo "Error: ${.TARGET} is missing.  Run 'make ahcfirmware'"
+.endif
 
+
 SRCS= ${GENSRCS}
 SRCS+= aic7xxx.c aic7xxx_93cx6.c aic7xxx_osm.c aic7770.c
 SRCS+= opt_scsi.h opt_aic7xxx.h opt_cam.h
 SRCS+= device_if.h bus_if.h pci_if.h
 
+.if make(cleanfirmware)
+cleanfirmware: clean
 CLEANFILES= ${GENSRCS}
+.endif
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/aic7xxx/ahc/Makefile.inc
===================================================================
--- trunk/sys/modules/aic7xxx/ahc/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/ahc/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/aic7xxx/ahc/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/aic7xxx/ahc/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
===================================================================
--- trunk/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,18 +1,14 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile 270306 2014-08-21 21:36:06Z ian $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=		ahc_eisa
 
-../aic7xxx_reg.h:
-	( cd .. ; ${MAKE} aic7xxx_reg.h )
-
-SRCS=	ahc_eisa.c ../aic7xxx_reg.h
-SRCS+=	device_if.h bus_if.h eisa_if.h
+SRCS=	ahc_eisa.c
+SRCS+=	device_if.h bus_if.h eisa_if.h pci_if.h
 SRCS+=	opt_scsi.h opt_cam.h opt_aic7xxx.h
 
 CFLAGS+=	-I${.CURDIR}/../../../../dev/aic7xxx -I..
 
-CLEANFILES=	../aic7xxx_reg.h ../aic7xxx_seq.h
-
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
===================================================================
--- trunk/sys/modules/aic7xxx/ahc/ahc_isa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/ahc/ahc_isa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,18 +1,14 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/aic7xxx/ahc/ahc_isa/Makefile 270284 2014-08-21 17:18:21Z ian $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=		ahc_isa
 
-../aic7xxx_reg.h:
-	( cd .. ; ${MAKE} aic7xxx_reg.h )
-
-SRCS=	ahc_isa.c ../aic7xxx_reg.h
+SRCS=	ahc_isa.c
 SRCS+=	device_if.h bus_if.h pci_if.h isa_if.h
 SRCS+=	opt_scsi.h opt_cam.h opt_aic7xxx.h
 
 CFLAGS+=	-I${.CURDIR}/../../../../dev/aic7xxx -I..
 
-CLEANFILES=	../aic7xxx_reg.h ../aic7xxx_seq.h
-
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
===================================================================
--- trunk/sys/modules/aic7xxx/ahc/ahc_pci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/ahc/ahc_pci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,13 +1,11 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/aic7xxx/ahc/ahc_pci/Makefile 270284 2014-08-21 17:18:21Z ian $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=	ahc_pci
 
-../aic7xxx_reg.h:
-	( cd .. ; ${MAKE} aic7xxx_reg.h )
-
-SRCS=	ahc_pci.c aic7xxx_pci.c ../aic7xxx_reg.h
+SRCS=	ahc_pci.c aic7xxx_pci.c
 SRCS+=	device_if.h bus_if.h pci_if.h
 SRCS+=	opt_scsi.h opt_cam.h opt_aic7xxx.h
 

Modified: trunk/sys/modules/aic7xxx/ahd/Makefile
===================================================================
--- trunk/sys/modules/aic7xxx/ahd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/ahd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/aic7xxx/ahd/Makefile 270284 2014-08-21 17:18:21Z ian $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahd
@@ -15,25 +16,32 @@
 .endif
 BEFORE_DEPEND= ${GENSRCS}
 
-../aicasm/aicasm: ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
-	( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
-
+.if make(ahdfirmware)
+ahdfirmware: ${GENSRCS}
 ${GENSRCS}:								 \
 		${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq}	 \
-		${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
-	../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
+		${.CURDIR}/../../../cam/scsi/scsi_message.h
+	aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
 			-I${.CURDIR}/../../../dev/aic7xxx		 \
 			-o aic79xx_seq.h -r aic79xx_reg.h		 \
 			${REG_PRINT_OPT}				 \
 			-i ${.CURDIR}/../../../dev/aic7xxx/aic79xx_osm.h \
 			${.CURDIR}/../../../dev/aic7xxx/aic79xx.seq
+.else
+${GENSRCS}:
+	@echo "Error: ${.TARGET} is missing.  Run 'make ahdfirmware'."
+.endif
 
+
 SRCS= ${GENSRCS}
 SRCS+= aic79xx.c aic79xx_osm.c aic79xx_pci.c ahd_pci.c
 SRCS+= opt_scsi.h opt_aic79xx.h opt_cam.h opt_ddb.h
 SRCS+= device_if.h bus_if.h pci_if.h
 
+.if make(cleanfirmware)
+cleanfirmware: clean
 CLEANFILES= ${GENSRCS}
+.endif
 
 .include <bsd.kmod.mk>
 

Modified: trunk/sys/modules/aic7xxx/aicasm/Makefile
===================================================================
--- trunk/sys/modules/aic7xxx/aicasm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aic7xxx/aicasm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/aic7xxx/aicasm/Makefile 139607 2005-01-03 07:27:17Z njl $
 
 MAKESRCPATH=	${.CURDIR}/../../../dev/aic7xxx/aicasm
 

Modified: trunk/sys/modules/aio/Makefile
===================================================================
--- trunk/sys/modules/aio/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aio/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/aio/Makefile 185878 2008-12-10 20:56:19Z jhb $
 
 .PATH: ${.CURDIR}/../../kern
 

Modified: trunk/sys/modules/alc/Makefile
===================================================================
--- trunk/sys/modules/alc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/alc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/alc/Makefile 193880 2009-06-10 02:07:58Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/alc
 

Modified: trunk/sys/modules/ale/Makefile
===================================================================
--- trunk/sys/modules/ale/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ale/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/ale/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ale/Makefile 184870 2008-11-12 09:52:06Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/ale
 

Modified: trunk/sys/modules/alq/Makefile
===================================================================
--- trunk/sys/modules/alq/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/alq/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/alq/Makefile 205959 2010-03-31 03:58:57Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/amd/Makefile
===================================================================
--- trunk/sys/modules/amd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/amd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/amd

Modified: trunk/sys/modules/amdsbwd/Makefile
===================================================================
--- trunk/sys/modules/amdsbwd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/amdsbwd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/amdsbwd/Makefile 199969 2009-11-30 11:44:03Z avg $
 
 .PATH:  ${.CURDIR}/../../dev/amdsbwd
 KMOD    = amdsbwd

Modified: trunk/sys/modules/amdtemp/Makefile
===================================================================
--- trunk/sys/modules/amdtemp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/amdtemp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/amdtemp/Makefile,v 1.1.2.1 2009/05/21 17:09:23 rpaulo Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/amdtemp/Makefile 189768 2009-03-13 16:08:08Z rpaulo $
 
 .PATH:	${.CURDIR}/../../dev/amdtemp
 

Modified: trunk/sys/modules/amr/Makefile
===================================================================
--- trunk/sys/modules/amr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/amr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/amr/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../dev/amr
 

Modified: trunk/sys/modules/amr/amr_cam/Makefile
===================================================================
--- trunk/sys/modules/amr/amr_cam/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/amr/amr_cam/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/amr/amr_cam/Makefile 184577 2008-11-03 04:13:27Z scottl $
 
 .PATH: ${.CURDIR}/../../../dev/amr
 

Modified: trunk/sys/modules/amr/amr_linux/Makefile
===================================================================
--- trunk/sys/modules/amr/amr_linux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/amr/amr_linux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/amr/amr_linux/Makefile 154789 2006-01-24 21:13:50Z ambrisko $
 
 .PATH: ${.CURDIR}/../../../dev/amr
 

Modified: trunk/sys/modules/an/Makefile
===================================================================
--- trunk/sys/modules/an/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/an/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/an/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../dev/an
 

Modified: trunk/sys/modules/aout/Makefile
===================================================================
--- trunk/sys/modules/aout/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/aout/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/aout/Makefile 103226 2002-09-11 18:03:03Z peter $
 
 .PATH: ${.CURDIR}/../../kern
 

Modified: trunk/sys/modules/apm/Makefile
===================================================================
--- trunk/sys/modules/apm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/apm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/apm/Makefile 145326 2005-04-20 12:28:20Z nyan $
 
 .PATH: ${.CURDIR}/../../i386/bios
 .if ${MACHINE} == "pc98"

Modified: trunk/sys/modules/arcmsr/Makefile
===================================================================
--- trunk/sys/modules/arcmsr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/arcmsr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/arcmsr/Makefile 144411 2005-03-31 18:19:55Z scottl $
 
 .PATH: ${.CURDIR}/../../dev/arcmsr
 

Modified: trunk/sys/modules/arcnet/Makefile
===================================================================
--- trunk/sys/modules/arcnet/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/arcnet/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/arcnet/Makefile 220470 2011-04-09 09:07:31Z uqs $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/asmc/Makefile
===================================================================
--- trunk/sys/modules/asmc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/asmc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/asmc/Makefile 177973 2008-04-07 11:26:13Z rpaulo $
 
 .PATH: ${.CURDIR}/../../dev/asmc
 

Modified: trunk/sys/modules/asr/Makefile
===================================================================
--- trunk/sys/modules/asr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/asr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/asr/Makefile 228865 2011-12-24 17:54:58Z dim $
 
 .PATH: ${.CURDIR}/../../dev/asr
 

Modified: trunk/sys/modules/ata/Makefile
===================================================================
--- trunk/sys/modules/ata/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,13 @@
-# $MidnightBSD: src/sys/modules/ata/Makefile,v 1.2 2010/02/06 23:08:34 laffer1 Exp $
-# $FreeBSD: src/sys/modules/ata/Makefile,v 1.2 2005/04/05 02:05:01 scottl Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/Makefile 249083 2013-04-04 07:12:24Z mav $
 
 SUBDIR = atacore
 SUBDIR += atacard
+.if ${MACHINE} == "pc98"
+SUBDIR += atacbus
+.else
 SUBDIR += ataisa
+.endif
 SUBDIR += atapci 
-SUBDIR += atadisk atapicd atapifd atapist ataraid atapicam #atacam
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/ata/Makefile.inc
===================================================================
--- trunk/sys/modules/ata/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/ata/Makefile.inc 144330 2005-03-30 12:03:40Z sos $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/ata/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/ata/atacam/Makefile
===================================================================
--- trunk/sys/modules/ata/atacam/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atacam/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata

Modified: trunk/sys/modules/ata/atacard/Makefile
===================================================================
--- trunk/sys/modules/ata/atacard/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atacard/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atacard/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
 KMOD=	atacard
 SRCS=	ata-card.c
-SRCS+=  opt_ata.h pccarddevs.h ata_if.h device_if.h bus_if.h isa_if.h card_if.h
+SRCS+=	ata_if.h bus_if.h card_if.h device_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/ata/atacbus/Makefile
===================================================================
--- trunk/sys/modules/ata/atacbus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atacbus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atacbus/Makefile 251114 2013-05-29 23:56:49Z marius $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
 KMOD=	atacbus
 SRCS=	ata-cbus.c
-SRCS+=	opt_ata.h ata_if.h device_if.h bus_if.h isa_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h isa_if.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/ata/atacore/Makefile
===================================================================
--- trunk/sys/modules/ata/atacore/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atacore/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atacore/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
 KMOD=	ata
-SRCS=	ata-all.c ata-lowlevel.c ata-queue.c ata_if.c
-SRCS+=	opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS=	ata-all.c ata_if.c ata-lowlevel.c
+SRCS+=	ata_if.h bus_if.h device_if.h opt_cam.h pci_if.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/ata/atadevel/Makefile
===================================================================
--- trunk/sys/modules/ata/atadevel/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atadevel/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata

Modified: trunk/sys/modules/ata/atadevel/ata-devel.c
===================================================================
--- trunk/sys/modules/ata/atadevel/ata-devel.c	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atadevel/ata-devel.c	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2008 S\xf8ren Schmidt <sos at FreeBSD.org>
  * All rights reserved.

Modified: trunk/sys/modules/ata/atadisk/Makefile
===================================================================
--- trunk/sys/modules/ata/atadisk/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atadisk/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata ${.CURDIR}/../../../${MACHINE}/${MACHINE}

Modified: trunk/sys/modules/ata/ataisa/Makefile
===================================================================
--- trunk/sys/modules/ata/ataisa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/ataisa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/ataisa/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
 KMOD=	ataisa
 SRCS=	ata-isa.c
-SRCS+=	opt_ata.h ata_if.h device_if.h bus_if.h isa_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h isa_if.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/ata/atapci/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 SUBDIR += chipsets
 
@@ -6,7 +7,6 @@
 
 KMOD=	atapci
 SRCS=	ata-pci.c ata-dma.c ata-sata.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/Makefile.inc
===================================================================
--- trunk/sys/modules/ata/atapci/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/ata/atapci/Makefile.inc 183724 2008-10-09 12:56:57Z sos $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/ata/atapci/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/ata/atapci/chipsets/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/Makefile 287016 2015-08-22 07:32:47Z mav $
 
-SUBDIR += ataacard ataacerlabs ataadaptec ataahci ataamd ataati atacenatek atacypress atacyrix atahighpoint ataintel ataite atajmicron atamarvell atamicron atanational atanetcell atanvidia atapromise ataserverworks atasiliconimage atasis atavia
+SUBDIR += ataacard ataacerlabs ataamd ataati atacenatek atacypress atacyrix atahighpoint ataintel ataite atajmicron atamarvell atamicron atanational atanetcell atanvidia atapromise ataserverworks atasiliconimage atasis atavia
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/ata/atapci/chipsets/Makefile.inc
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/Makefile.inc 183724 2008-10-09 12:56:57Z sos $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/ata/atapci/chipsets/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/ata/atapci/chipsets/ataacard/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataacard/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataacard/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/ataacard/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	ataacard
 SRCS=	ata-acard.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	ataacerlabs
 SRCS=	ata-acerlabs.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets

Modified: trunk/sys/modules/ata/atapci/chipsets/ataahci/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataahci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataahci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets

Modified: trunk/sys/modules/ata/atapci/chipsets/ataamd/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataamd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataamd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/ataamd/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	ataamd
 SRCS=	ata-amd.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/ataati/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataati/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataati/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/ataati/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	ataati
 SRCS=	ata-ati.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atacenatek/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atacenatek/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atacenatek/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atacenatek/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atacenatek
 SRCS=	ata-cenatek.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atacypress/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atacypress/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atacypress/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atacypress/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atacypress
 SRCS=	ata-cypress.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atacyrix/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atacyrix/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atacyrix/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atacyrix/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atacyrix
 SRCS=	ata-cyrix.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atahighpoint
 SRCS=	ata-highpoint.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/ataintel/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataintel/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataintel/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/ataintel/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	ataintel
 SRCS=	ata-intel.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/ataite/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataite/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataite/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/ataite/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	ataite
 SRCS=	ata-ite.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atajmicron/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atajmicron/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atajmicron/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atajmicron/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atajmicron
 SRCS=	ata-jmicron.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atamarvell/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atamarvell/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atamarvell/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atamarvell/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atamarvell
 SRCS=	ata-marvell.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atamicron/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atamicron/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atamicron/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atamicron/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atamicron
 SRCS=	ata-micron.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atanational/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atanational/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atanational/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atanational/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atanational
 SRCS=	ata-national.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atanetcell/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atanetcell/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atanetcell/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atanetcell/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atanetcell
 SRCS=	ata-netcell.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atanvidia/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atanvidia/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atanvidia/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atanvidia/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atanvidia
 SRCS=	ata-nvidia.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atapromise/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atapromise/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atapromise/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atapromise/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atapromise
 SRCS=	ata-promise.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	ataserverworks
 SRCS=	ata-serverworks.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atasiliconimage
 SRCS=	ata-siliconimage.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atasis/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atasis/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atasis/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atasis/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atasis
 SRCS=	ata-sis.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapci/chipsets/atavia/Makefile
===================================================================
--- trunk/sys/modules/ata/atapci/chipsets/atavia/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapci/chipsets/atavia/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ata/atapci/chipsets/atavia/Makefile 249213 2013-04-06 19:12:49Z marius $
 
 .PATH: ${.CURDIR}/../../../../../dev/ata/chipsets
 
 KMOD=	atavia
 SRCS=	ata-via.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-

Modified: trunk/sys/modules/ata/atapicam/Makefile
===================================================================
--- trunk/sys/modules/ata/atapicam/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapicam/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata

Modified: trunk/sys/modules/ata/atapicd/Makefile
===================================================================
--- trunk/sys/modules/ata/atapicd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapicd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata

Modified: trunk/sys/modules/ata/atapifd/Makefile
===================================================================
--- trunk/sys/modules/ata/atapifd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapifd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata

Modified: trunk/sys/modules/ata/atapist/Makefile
===================================================================
--- trunk/sys/modules/ata/atapist/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/atapist/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata

Modified: trunk/sys/modules/ata/ataraid/Makefile
===================================================================
--- trunk/sys/modules/ata/ataraid/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ata/ataraid/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/ata

Modified: trunk/sys/modules/ath/Makefile
===================================================================
--- trunk/sys/modules/ath/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ath/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #
 # Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
 # All rights reserved.
@@ -26,17 +27,19 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ath/Makefile 313631 2017-02-11 07:14:45Z ngie $
 #
 
 ATH_RATE?=	sample		# tx rate control algorithm
 
-.PATH:	${.CURDIR}/../../dev/ath
-.PATH:	${.CURDIR}/../../dev/ath/ath_hal
+.PATH:	${SRCTOP}/sys/dev/ath
+.PATH:	${SRCTOP}/sys/dev/ath/ath_hal
 
 KMOD=	if_ath
-SRCS=	if_ath.c if_ath_debug.c if_ath_keycache.c if_ath_sysctl.c
-SRCS+=	if_ath_tx.c if_ath_tx_ht.c
+SRCS=	if_ath.c if_ath_alq.c if_ath_debug.c if_ath_keycache.c if_ath_sysctl.c
+SRCS+=	if_ath_tx.c if_ath_tx_ht.c if_ath_led.c if_ath_rx.c if_ath_tdma.c
+SRCS+=	if_ath_beacon.c if_ath_rx_edma.c if_ath_tx_edma.c if_ath_spectral.c
+SRCS+=	if_ath_btcoex.c if_ath_lna_div.c
 # NB: v3 eeprom support used by both AR5211 and AR5212; just include it
 SRCS+=	ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c
 SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h opt_wlan.h
@@ -44,7 +47,7 @@
 #
 # AR5210 support; these are first generation 11a-only devices.
 #
-.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar5210
+.PATH:	${SRCTOP}/sys/dev/ath/ath_hal/ar5210
 SRCS+=	ah_eeprom_v1.c \
 	ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \
 	ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \
@@ -54,7 +57,7 @@
 # AR5211 support; these are second generation 11b/g/a devices
 # (but 11g was OFDM only and is not supported).
 #
-.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar5211
+.PATH:	${SRCTOP}/sys/dev/ath/ath_hal/ar5211
 SRCS+=	ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \
 	ar5211_keycache.c ar5211_misc.c	ar5211_phy.c ar5211_power.c \
 	ar5211_recv.c ar5211_reset.c ar5211_xmit.c
@@ -62,7 +65,7 @@
 #
 # AR5212 support; this covers all other pci/cardbus legacy parts.
 #
-.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar5212
+.PATH:	${SRCTOP}/sys/dev/ath/ath_hal/ar5212
 SRCS+=	ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \
 	ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \
 	ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \
@@ -75,7 +78,7 @@
 SRCS+=	ar5413.c
 
 #
-# AR5416, AR9130, AR9160, AR9220, AR9280, AR9285 support.
+# AR5416, AR9130, AR9160, AR9220, AR9280, AR9285, AR9287 support.
 
 # Note enabling this support requires defining AH_SUPPORT_AR5416
 # in opt_ah.h so the 11n tx/rx descriptor format is handled.
@@ -83,19 +86,19 @@
 # NB: 9160 depends on 5416 but 5416 does not require 9160
 #
 # + 5416 (Owl)
-.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar5416
+.PATH:	${SRCTOP}/sys/dev/ath/ath_hal/ar5416
 SRCS+=	ah_eeprom_v14.c ah_eeprom_v4k.c \
-	ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \
-	ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \
+	ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_btcoex.c \
+	ar5416_cal.c ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \
 	ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \
-	ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \
-	ar5416_reset.c ar5416_xmit.c
+	ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_radar.c ar5416_spectral.c \
+	ar5416_recv.c ar5416_reset.c ar5416_xmit.c
 
 # RF backend for 5416, 9130 and 9160
 SRCS+=	ar2133.c
 
 # + AR9160 (Sowl)
-.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar9001
+.PATH:	${SRCTOP}/sys/dev/ath/ath_hal/ar9001
 SRCS+=	ar9160_attach.c
 
 # + AR9130 - (Sowl) - Embedded (AR913x SoC)
@@ -109,41 +112,59 @@
 
 # AR9002 series chips
 # + AR9220/AR9280 - Merlin
-.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar9002
+.PATH:	${SRCTOP}/sys/dev/ath/ath_hal/ar9002
 SRCS+=	ar9280.c ar9280_attach.c ar9280_olc.c
 
 # + AR9285 - Kite
 SRCS+=	ar9285.c ar9285_reset.c ar9285_attach.c ar9285_cal.c ar9285_phy.c
-SRCS+=	ar9285_diversity.c
+SRCS+=	ar9285_diversity.c ar9285_btcoex.c
 
 # + AR9287 - Kiwi
-.PATH:  ${.CURDIR}/../../dev/ath/ath_hal
+.PATH:  ${SRCTOP}/sys/dev/ath/ath_hal
 SRCS+=  ah_eeprom_9287.c
-.PATH:  ${.CURDIR}/../../dev/ath/ath_hal/ar9002
+.PATH:  ${SRCTOP}/sys/dev/ath/ath_hal/ar9002
 SRCS+=  ar9287.c ar9287_reset.c ar9287_attach.c ar9287_cal.c ar9287_olc.c
 
+# + AR9300 HAL
+.PATH:  ${SRCTOP}/sys/contrib/dev/ath/ath_hal/ar9300
+SRCS+= ar9300_interrupts.c ar9300_radar.c ar9300_ani.c ar9300_keycache.c
+SRCS+= ar9300_radio.c ar9300_xmit.c ar9300_attach.c ar9300_mci.c ar9300_stub.c
+SRCS+= ar9300_xmit_ds.c ar9300_beacon.c ar9300_misc.c ar9300_recv.c
+SRCS+= ar9300_stub_funcs.c ar9300_eeprom.c ar9300_paprd.c ar9300_recv_ds.c
+SRCS+= ar9300_freebsd.c ar9300_phy.c ar9300_reset.c ar9300_gpio.c
+SRCS+= ar9300_power.c ar9300_timer.c
+
 # NB: rate control is bound to the driver by symbol names so only pick one
 .if ${ATH_RATE} == "sample"
-.PATH:	${.CURDIR}/../../dev/ath/ath_rate/sample
+.PATH:	${SRCTOP}/sys/dev/ath/ath_rate/sample
 SRCS+=	sample.c
 .elif ${ATH_RATE} == "onoe"
-.PATH:	${.CURDIR}/../../dev/ath/ath_rate/onoe
+.PATH:	${SRCTOP}/sys/dev/ath/ath_rate/onoe
 SRCS+=	onoe.c
 .elif ${ATH_RATE} == "amrr"
-.PATH:	${.CURDIR}/../../dev/ath/ath_rate/amrr
+.PATH:	${SRCTOP}/sys/dev/ath/ath_rate/amrr
 SRCS+=	amrr.c
 .endif
 
 # DFS
-.PATH: ${.CURDIR}/../../dev/ath/ath_dfs/null
+.PATH: ${SRCTOP}/sys/dev/ath/ath_dfs/null
 SRCS+=	dfs_null.c
 
-CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
+CFLAGS+=  -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal
+CFLAGS+=  -I. -I${SRCTOP}/sys/contrib/dev/ath/ath_hal/
 
+.if !defined(KERNBUILDDIR)
 opt_ah.h:
 	echo '#define AH_SUPPORT_AR5416 1' > $@
+.endif
 
 .include <bsd.kmod.mk>
 
 CWARNFLAGS.ah_regdomain.c=	${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW}
+# XXX Work around clang warnings, until maintainer approves fix.
+CWARNFLAGS.if_ath.c=		${NO_WSOMETIMES_UNINITIALIZED}
 CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
+
+# AR9300 HAL build overrides, as there's still some code to tidy up
+CWARNFLAGS.ar9300_eeprom.c=	${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.ar9300_reset.c=	${NO_WSOMETIMES_UNINITIALIZED} -Wno-unused-function

Modified: trunk/sys/modules/ath_ahb/Makefile
===================================================================
--- trunk/sys/modules/ath_ahb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ath_ahb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #
 # Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
 # All rights reserved.
@@ -26,7 +27,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ath_ahb/Makefile 227413 2011-11-09 23:53:13Z adrian $
 #
 
 .PATH:	${.CURDIR}/../../dev/ath
@@ -34,7 +35,7 @@
 
 KMOD=	if_ath_ahb
 SRCS=	if_ath_ahb.c
-SRCS+=	device_if.h bus_if.h
+SRCS+=	device_if.h bus_if.h opt_wlan.h opt_ath.h opt_ah.h
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
 

Modified: trunk/sys/modules/ath_pci/Makefile
===================================================================
--- trunk/sys/modules/ath_pci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ath_pci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #
 # Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
 # All rights reserved.
@@ -26,7 +27,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ath_pci/Makefile 227413 2011-11-09 23:53:13Z adrian $
 #
 
 .PATH:	${.CURDIR}/../../dev/ath
@@ -34,7 +35,7 @@
 
 KMOD=	if_ath_pci
 SRCS=	if_ath_pci.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_ah.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_wlan.h opt_ath.h opt_ah.h
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
 

Modified: trunk/sys/modules/auxio/Makefile
===================================================================
--- trunk/sys/modules/auxio/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/auxio/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/auxio/Makefile 142435 2005-02-25 06:59:56Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/auxio
 

Modified: trunk/sys/modules/bce/Makefile
===================================================================
--- trunk/sys/modules/bce/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bce/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bce/Makefile 272001 2014-09-22 20:53:17Z davidcs $
 .PATH:	${.CURDIR}/../../dev/bce
 KMOD=	if_bce
 SRCS=	opt_bce.h if_bce.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h

Modified: trunk/sys/modules/bfe/Makefile
===================================================================
--- trunk/sys/modules/bfe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bfe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bfe/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/bfe
 

Modified: trunk/sys/modules/bge/Makefile
===================================================================
--- trunk/sys/modules/bge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bge/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../dev/bge
 

Modified: trunk/sys/modules/bios/Makefile
===================================================================
--- trunk/sys/modules/bios/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bios/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,11 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bios/Makefile 309842 2016-12-11 02:01:59Z rpokala $
 #
 
-SUBDIR=	smapi smbios vpd
+SUBDIR=	smbios vpd
 
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=	smapi
+.endif
+
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/bios/smapi/Makefile
===================================================================
--- trunk/sys/modules/bios/smapi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bios/smapi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bios/smapi/Makefile 232263 2012-02-28 18:30:18Z dim $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios

Modified: trunk/sys/modules/bios/smbios/Makefile
===================================================================
--- trunk/sys/modules/bios/smbios/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bios/smbios/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bios/smbios/Makefile 204309 2010-02-25 14:13:39Z attilio $
 #
 
 .PATH:  ${.CURDIR}/../../../x86/bios

Modified: trunk/sys/modules/bios/vpd/Makefile
===================================================================
--- trunk/sys/modules/bios/vpd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bios/vpd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bios/vpd/Makefile 204309 2010-02-25 14:13:39Z attilio $
 #
 
 .PATH:  ${.CURDIR}/../../../x86/bios

Modified: trunk/sys/modules/bktr/Makefile
===================================================================
--- trunk/sys/modules/bktr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bktr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bktr/Makefile 65697 2000-09-10 15:40:20Z roger $
 
 SUBDIR =
 SUBDIR += bktr

Modified: trunk/sys/modules/bktr/Makefile.inc
===================================================================
--- trunk/sys/modules/bktr/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bktr/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/bktr/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/bktr/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/bktr/bktr/Makefile
===================================================================
--- trunk/sys/modules/bktr/bktr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bktr/bktr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bktr/bktr/Makefile 177671 2008-03-27 20:38:03Z antoine $
 
 # Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
 

Modified: trunk/sys/modules/bktr/bktr_mem/Makefile
===================================================================
--- trunk/sys/modules/bktr/bktr_mem/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bktr/bktr_mem/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bktr/bktr_mem/Makefile 160063 2006-07-01 10:51:55Z markm $
 
 .PATH: ${.CURDIR}/../../../dev/bktr
 

Modified: trunk/sys/modules/bm/Makefile
===================================================================
--- trunk/sys/modules/bm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bm/Makefile 179645 2008-06-07 22:58:32Z marcel $
 
 .PATH: ${.CURDIR}/../../dev/bm
 

Modified: trunk/sys/modules/bridgestp/Makefile
===================================================================
--- trunk/sys/modules/bridgestp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bridgestp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bridgestp/Makefile 193744 2009-06-08 19:57:35Z bz $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/bwi/Makefile
===================================================================
--- trunk/sys/modules/bwi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bwi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,11 +1,12 @@
-# $MidnightBSD: src/sys/modules/bwi/Makefile,v 1.2 2009/01/20 16:32:51 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bwi/Makefile 235775 2012-05-22 06:33:08Z uqs $
 
 .PATH: ${.CURDIR}/../../dev/bwi
 
 KMOD	= if_bwi
 
-SRCS	=	if_bwi.c if_bwi_pci.c bwimac.c bwiphy.c bwirf.c
-SRCS	+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_bwi.h
+SRCS	= if_bwi.c if_bwi_pci.c bwimac.c bwiphy.c bwirf.c
+SRCS	+= device_if.h bus_if.h pci_if.h opt_inet.h opt_bwi.h opt_wlan.h
 
 opt_bwi.h:
 	echo '#define BWI_DEBUG 1' > opt_bwi.h

Modified: trunk/sys/modules/bwn/Makefile
===================================================================
--- trunk/sys/modules/bwn/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bwn/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bwn/Makefile 239462 2012-08-20 18:33:03Z dim $
 
 .PATH: ${.CURDIR}/../../dev/bwn
 
@@ -7,3 +8,7 @@
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
+
+# XXX Work around clang warning, until maintainer approves fix.
+CWARNFLAGS.if_bwn.c=	${NO_WSOMETIMES_UNINITIALIZED}
+CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/bxe/Makefile
===================================================================
--- trunk/sys/modules/bxe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/bxe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,13 +1,19 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/bxe/Makefile 271988 2014-09-22 19:00:30Z davidcs $
 BXE	= ${.CURDIR}/../../dev/bxe
 .PATH:	${BXE}
 
-KMOD=	if_bxe
-SRCS	= opt_bxe.h device_if.h bus_if.h pci_if.h
-SRCS	+= if_bxe.c bxe_link.c
+KMOD	= if_bxe
+SRCS	= device_if.h bus_if.h pci_if.h
+SRCS	+= bxe.c               \
+           bxe_stats.c         \
+           bxe_debug.c         \
+           bxe_elink.c         \
+           ecore_sp.c          \
+           57710_init_values.c \
+           57711_init_values.c \
+           57712_init_values.c
 
-CFLAGS += -I${BXE} -DBXE_TASK
-#CFLAGS += -DBXE_DEBUG
-#CFLAGS += -DBXE_NVRAM_WRITE_SUPPORT
+CFLAGS += -I${BXE}
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/cam/Makefile
===================================================================
--- trunk/sys/modules/cam/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cam/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cam/Makefile 331632 2018-03-27 17:42:04Z brooks $
 
 S=	${.CURDIR}/../..
 
@@ -8,14 +9,17 @@
 
 # See sys/conf/options for the flags that go into the different opt_*.h files.
 SRCS=	opt_cam.h
+SRCS+=	opt_compat.h
 SRCS+=	opt_ada.h
-SRCS+=	opt_ata.h
 SRCS+=	opt_scsi.h
 SRCS+=	opt_cd.h
 SRCS+=	opt_pt.h
 SRCS+=	opt_sa.h
+SRCS+=	opt_ses.h
+SRCS+=	opt_ddb.h
 SRCS+=	device_if.h bus_if.h vnode_if.h
 SRCS+=	cam.c
+SRCS+=	cam_compat.c
 .if exists($S/${MACHINE}/${MACHINE}/cam_machdep.c)
 SRCS+=	cam_machdep.c
 .endif

Modified: trunk/sys/modules/canbepm/Makefile
===================================================================
--- trunk/sys/modules/canbepm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/canbepm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/canbepm/Makefile 110285 2003-02-03 14:46:26Z nyan $
 
 .PATH:	${.CURDIR}/../../pc98/pc98
 KMOD	= canbepm

Modified: trunk/sys/modules/canbus/Makefile
===================================================================
--- trunk/sys/modules/canbus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/canbus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/canbus/Makefile 110285 2003-02-03 14:46:26Z nyan $
 
 .PATH:	${.CURDIR}/../../pc98/pc98
 KMOD	= canbus

Modified: trunk/sys/modules/cardbus/Makefile
===================================================================
--- trunk/sys/modules/cardbus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cardbus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/cardbus/Makefile,v 1.10.14.2 2006/03/01 18:19:33 imp Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
 
 .PATH: ${.CURDIR}/../../dev/cardbus
 

Modified: trunk/sys/modules/cas/Makefile
===================================================================
--- trunk/sys/modules/cas/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cas/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cas/Makefile 209991 2010-07-13 12:47:31Z nwhitehorn $
 
 .PATH: ${.CURDIR}/../../dev/cas
 

Modified: trunk/sys/modules/cbb/Makefile
===================================================================
--- trunk/sys/modules/cbb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cbb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cbb/Makefile 133861 2004-08-16 15:24:03Z imp $
 
 .PATH: ${.CURDIR}/../../dev/pccbb
 

Modified: trunk/sys/modules/cc/Makefile
===================================================================
--- trunk/sys/modules/cc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cc/Makefile 252504 2013-07-02 08:44:56Z lstewart $
 
-SUBDIR=	cc_chd \
+SUBDIR=	cc_cdg \
+	cc_chd \
 	cc_cubic \
 	cc_hd \
 	cc_htcp \

Modified: trunk/sys/modules/cc/cc_chd/Makefile
===================================================================
--- trunk/sys/modules/cc/cc_chd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cc/cc_chd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cc/cc_chd/Makefile 218155 2011-02-01 07:05:14Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/cc/cc_cubic/Makefile
===================================================================
--- trunk/sys/modules/cc/cc_cubic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cc/cc_cubic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cc/cc_cubic/Makefile 216114 2010-12-02 06:05:44Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/cc/cc_hd/Makefile
===================================================================
--- trunk/sys/modules/cc/cc_hd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cc/cc_hd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cc/cc_hd/Makefile 218153 2011-02-01 06:42:46Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/cc/cc_htcp/Makefile
===================================================================
--- trunk/sys/modules/cc/cc_htcp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cc/cc_htcp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cc/cc_htcp/Makefile 216115 2010-12-02 06:40:21Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/cc/cc_vegas/Makefile
===================================================================
--- trunk/sys/modules/cc/cc_vegas/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cc/cc_vegas/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cc/cc_vegas/Makefile 218152 2011-02-01 06:17:00Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/cd9660/Makefile
===================================================================
--- trunk/sys/modules/cd9660/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cd9660/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/cd9660/Makefile,v 1.16 2007/02/11 14:01:31 rodrigc Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cd9660/Makefile 166640 2007-02-11 14:01:32Z rodrigc $
 
 .PATH: ${.CURDIR}/../../fs/cd9660
 

Modified: trunk/sys/modules/cd9660_iconv/Makefile
===================================================================
--- trunk/sys/modules/cd9660_iconv/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cd9660_iconv/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/cd9660_iconv/Makefile,v 1.2 2007/02/11 14:01:31 rodrigc Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cd9660_iconv/Makefile 166640 2007-02-11 14:01:32Z rodrigc $
 
 .PATH:	${.CURDIR}/../../fs/cd9660
 KMOD=	cd9660_iconv

Modified: trunk/sys/modules/ce/Makefile
===================================================================
--- trunk/sys/modules/ce/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ce/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 # $Cronyx: sys.modules.ce.Makefile,v 1.2 2005/04/23 20:10:22 rik Exp $
-# $FreeBSD: src/sys/modules/ce/Makefile,v 1.2.6.1 2006/03/10 22:57:36 rik Exp $
+# $FreeBSD: stable/10/sys/modules/ce/Makefile 228971 2011-12-29 21:17:35Z dim $
 
 .PATH:  ${.CURDIR}/../../dev/ce
 KMOD	= if_ce

Modified: trunk/sys/modules/ciss/Makefile
===================================================================
--- trunk/sys/modules/ciss/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ciss/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ciss/Makefile 106038 2002-10-27 12:09:51Z mux $
 
 KMOD		=  ciss
 .PATH:		${.CURDIR}/../../dev/${KMOD}

Modified: trunk/sys/modules/cm/Makefile
===================================================================
--- trunk/sys/modules/cm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cm/Makefile 89099 2002-01-08 20:03:13Z fjoe $
 
 .PATH: ${.CURDIR}/../../dev/cm
 

Modified: trunk/sys/modules/cmx/Makefile
===================================================================
--- trunk/sys/modules/cmx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cmx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cmx/Makefile 241828 2012-10-22 02:12:11Z eadler $
 #
 .PATH:	${.CURDIR}/../../dev/cmx
 

Modified: trunk/sys/modules/coff/Makefile
===================================================================
--- trunk/sys/modules/coff/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/coff/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/coff/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH: ${.CURDIR}/../../i386/ibcs2
 

Modified: trunk/sys/modules/coretemp/Makefile
===================================================================
--- trunk/sys/modules/coretemp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/coretemp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/coretemp/Makefile 171854 2007-08-15 19:26:03Z des $
 
 .PATH: ${.CURDIR}/../../dev/coretemp
 

Modified: trunk/sys/modules/cp/Makefile
===================================================================
--- trunk/sys/modules/cp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 # $Cronyx: sys.modules.cp.Makefile,v 1.1.2.3 2004/04/28 16:17:57 rik Exp $
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/cp/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH:  ${.CURDIR}/../../dev/cp
 KMOD	= if_cp

Modified: trunk/sys/modules/cpuctl/Makefile
===================================================================
--- trunk/sys/modules/cpuctl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cpuctl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/cpuctl/Makefile,v 1.1.2.1 2009/01/12 15:48:22 stas Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cpuctl/Makefile 181430 2008-08-08 16:26:53Z stas $
 
 .PATH: ${.CURDIR}/../../dev/cpuctl
 

Modified: trunk/sys/modules/cpufreq/Makefile
===================================================================
--- trunk/sys/modules/cpufreq/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cpufreq/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/modules/cpufreq/Makefile,v 1.3 2010/03/12 04:28:25 laffer1 Exp $
-# $FreeBSD: src/sys/modules/cpufreq/Makefile,v 1.8 2005/04/19 16:38:24 njl Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cpufreq/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH:	${.CURDIR}/../../dev/cpufreq		\
 	${.CURDIR}/../../${MACHINE_CPUARCH}/cpufreq
@@ -19,4 +19,9 @@
 SRCS+=	smist.c
 .endif
 
+.if ${MACHINE} == "powerpc"
+.PATH:	${.CURDIR}/../../powerpc/cpufreq
+SRCS+= dfs.c
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/crypto/Makefile
===================================================================
--- trunk/sys/modules/crypto/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/crypto/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/crypto/Makefile 314327 2017-02-27 08:27:38Z avg $
 
 .PATH:	${.CURDIR}/../../opencrypto
 .PATH:	${.CURDIR}/../../crypto
@@ -11,10 +12,10 @@
 KMOD	= crypto
 SRCS	= crypto.c cryptodev_if.c
 SRCS	+= criov.c cryptosoft.c xform.c
-SRCS	+= cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
+SRCS	+= cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
 SRCS	+= skipjack.c bf_enc.c bf_ecb.c bf_skey.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c
-SRCS	+= sha1.c sha2.c
+SRCS	+= sha1.c sha256c.c sha512c.c
 SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
 SRCS	+= opt_ddb.h opt_kdtrace.h
 SRCS	+= camellia.c camellia-api.c

Modified: trunk/sys/modules/cryptodev/Makefile
===================================================================
--- trunk/sys/modules/cryptodev/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cryptodev/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cryptodev/Makefile 213781 2010-10-13 14:44:38Z rpaulo $
 
 .PATH:	${.CURDIR}/../../opencrypto
 KMOD	= cryptodev

Modified: trunk/sys/modules/cs/Makefile
===================================================================
--- trunk/sys/modules/cs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cs/Makefile 134745 2004-09-04 03:32:15Z imp $
 
 .PATH: ${.CURDIR}/../../dev/cs
 

Modified: trunk/sys/modules/ctau/Makefile
===================================================================
--- trunk/sys/modules/ctau/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ctau/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 # Cronyx Id: sys.modules.ct.Makefile,v 1.1.2.2 2003/12/08 15:39:01 rik Exp $
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ctau/Makefile 182668 2008-09-01 23:59:00Z imp $
 .PATH:  ${.CURDIR}/../../dev/ctau
 KMOD=   if_ct
 SRCS=   if_ct.c ctddk.c ctau.c opt_netgraph.h opt_ng_cronyx.h \

Modified: trunk/sys/modules/cx/Makefile
===================================================================
--- trunk/sys/modules/cx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 # Cronyx Id: sys.modules.cx.Makefile,v 1.1.2.2 2003/01/21 15:15:49 rik Exp $
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/cx/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH:  ${.CURDIR}/../../dev/cx
 KMOD=   if_cx

Modified: trunk/sys/modules/cxgb/Makefile
===================================================================
--- trunk/sys/modules/cxgb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cxgb/Makefile 237263 2012-06-19 07:34:13Z np $
 SUBDIR= cxgb
 SUBDIR+= cxgb_t3fw
-#SUBDIR+= ${_tom}
-#SUBDIR+= ${_iw_cxgb}
+SUBDIR+= ${_tom}
+SUBDIR+= ${_iw_cxgb}
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _tom=		tom

Modified: trunk/sys/modules/cxgb/cxgb/Makefile
===================================================================
--- trunk/sys/modules/cxgb/cxgb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgb/cxgb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cxgb/cxgb/Makefile 255608 2013-09-16 06:25:54Z kib $
 
 .include <bsd.own.mk>
 
@@ -10,7 +11,7 @@
 SRCS+=	cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c cxgb_aq100x.c
 SRCS+=  cxgb_sge.c cxgb_tn1010.c
 SRCS+=	device_if.h bus_if.h pci_if.h
-SRCS+=	opt_inet.h opt_inet6.h opt_zero.h opt_sched.h
+SRCS+=	opt_inet.h opt_inet6.h opt_sched.h
 SRCS+=	uipc_mvec.c
 
 CFLAGS+= -g -DDEFAULT_JUMBO -I${CXGB}

Modified: trunk/sys/modules/cxgb/cxgb_t3fw/Makefile
===================================================================
--- trunk/sys/modules/cxgb/cxgb_t3fw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgb/cxgb_t3fw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cxgb/cxgb_t3fw/Makefile 183292 2008-09-23 03:16:54Z kmacy $
 
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB} 

Modified: trunk/sys/modules/cxgb/iw_cxgb/Makefile
===================================================================
--- trunk/sys/modules/cxgb/iw_cxgb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgb/iw_cxgb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cxgb/iw_cxgb/Makefile 237263 2012-06-19 07:34:13Z np $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/cxgb/tom/Makefile
===================================================================
--- trunk/sys/modules/cxgb/tom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgb/tom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/cxgb/tom/Makefile 237263 2012-06-19 07:34:13Z np $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/cxgbe/Makefile
===================================================================
--- trunk/sys/modules/cxgbe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgbe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,14 +1,28 @@
 # $MidnightBSD$
 #
-# $FreeBSD: stable/9/sys/modules/cxgbe/Makefile 237920 2012-07-01 12:00:36Z np $
+# $FreeBSD: stable/10/sys/modules/cxgbe/Makefile 309560 2016-12-05 20:43:25Z jhb $
 #
 
-SUBDIR = if_cxgbe
-SUBDIR+= firmware
-#SUBDIR+= ${_tom}
+SUBDIR=	if_cxgbe
+SUBDIR+=	if_cxl
+SUBDIR+=	if_cc
+SUBDIR+=	if_cxgbev
+SUBDIR+=	if_cxlv
+SUBDIR+=	if_ccv
+SUBDIR+=	t4_firmware
+SUBDIR+=	t5_firmware
+SUBDIR+=	t6_firmware
+SUBDIR+=	${_tom}
+SUBDIR+=	${_iw_cxgbe}
 
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-_tom=		tom
+.if ${MACHINE_CPUARCH} == "amd64"
+_tom=	tom
+_iw_cxgbe=	iw_cxgbe
 .endif
 
+.if ${MACHINE_CPUARCH} == "i386"
+_tom=	tom
+.endif
+
+
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/cxgbe/if_cxgbe/Makefile
===================================================================
--- trunk/sys/modules/cxgbe/if_cxgbe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgbe/if_cxgbe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,25 +1,35 @@
 # $MidnightBSD$
 #
-# $FreeBSD: stable/9/sys/modules/cxgbe/if_cxgbe/Makefile 240169 2012-09-06 17:28:47Z np $
+# $FreeBSD: stable/10/sys/modules/cxgbe/if_cxgbe/Makefile 318851 2017-05-25 01:43:28Z np $
 #
 
 .include <bsd.own.mk>
 
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${.CURDIR}/../../../dev/cxgbe
 .PATH: ${CXGBE} ${CXGBE}/common
 
-KMOD = if_cxgbe
-SRCS = t4_main.c t4_sge.c t4_l2t.c
-SRCS+= t4_hw.c
-SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h opt_inet6.h
-SRCS+= opt_ofed.h
+KMOD=	if_cxgbe
+SRCS=	bus_if.h
+SRCS+=	device_if.h
+SRCS+=	opt_ddb.h
+SRCS+=	opt_inet.h
+SRCS+=	opt_inet6.h
+SRCS+=	opt_ofed.h
+SRCS+=	pci_if.h
+SRCS+=	t4_hw.c
+SRCS+=	t4_l2t.c
+SRCS+=	t4_main.c
+SRCS+=	t4_mp_ring.c
+SRCS+=	t4_netmap.c
+SRCS+=	t4_sched.c
+SRCS+=	t4_sge.c
+SRCS+=	t4_tracer.c
 
-CFLAGS+= -I${CXGBE}
-
 # Provide the timestamp of a packet in its header mbuf.
 #CFLAGS+= -DT4_PKT_TIMESTAMP
 
+CFLAGS+= -I${CXGBE}
+
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET_SUPPORT} != "no"
 opt_inet.h:
@@ -34,3 +44,4 @@
 .endif
 
 .include <bsd.kmod.mk>
+CFLAGS+= ${GCC_MS_EXTENSIONS}

Modified: trunk/sys/modules/cxgbe/t4_firmware/Makefile
===================================================================
--- trunk/sys/modules/cxgbe/t4_firmware/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgbe/t4_firmware/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,12 +1,13 @@
+# $MidnightBSD$
 #
-# $FreeBSD: release/9.2.0/sys/modules/cxgbe/t4_firmware/Makefile 252814 2013-07-05 18:27:38Z np $
+# $FreeBSD: stable/10/sys/modules/cxgbe/t4_firmware/Makefile 331719 2018-03-29 01:20:58Z np $
 #
 
-T4FW = ${.CURDIR}/../../../dev/cxgbe/firmware
+T4FW=	${.CURDIR}/../../../dev/cxgbe/firmware
 .PATH: ${T4FW}
 
-KMOD = t4fw_cfg
-FIRMWS = ${KMOD}.txt:${KMOD}:1.0.0.0
+KMOD=	t4fw_cfg
+FIRMWS=	${KMOD}.txt:${KMOD}:1.0.0.0
 
 # You can have additional configuration files in the ${T4FW} directory.
 # t4fw_cfg_<name>.txt
@@ -13,13 +14,13 @@
 CFG_FILES != cd ${T4FW} && echo ${KMOD}_*.txt
 .for F in ${CFG_FILES}
 .if exists(${F})
-FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
+FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T4FW_VER = 1.8.11.0
-FIRMWS += t4fw.fw:t4fw:${T4FW_VER}
-CLEANFILES += t4fw.fw
+T4FW_VER=	1.16.63.0
+FIRMWS+=	t4fw.fw:t4fw:${T4FW_VER}
+CLEANFILES+=	t4fw.fw
 
 t4fw.fw: t4fw-${T4FW_VER}.bin.uu
 	uudecode -o ${.TARGET} ${.ALLSRC}

Modified: trunk/sys/modules/cxgbe/t5_firmware/Makefile
===================================================================
--- trunk/sys/modules/cxgbe/t5_firmware/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgbe/t5_firmware/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,12 +1,13 @@
+# $MidnightBSD$
 #
-# $FreeBSD: release/9.2.0/sys/modules/cxgbe/t5_firmware/Makefile 252661 2013-07-03 23:52:15Z np $
+# $FreeBSD: stable/10/sys/modules/cxgbe/t5_firmware/Makefile 331719 2018-03-29 01:20:58Z np $
 #
 
-T5FW = ${.CURDIR}/../../../dev/cxgbe/firmware
+T5FW=	${.CURDIR}/../../../dev/cxgbe/firmware
 .PATH: ${T5FW}
 
-KMOD = t5fw_cfg
-FIRMWS = ${KMOD}.txt:${KMOD}:1.0.0.0
+KMOD=	t5fw_cfg
+FIRMWS=	${KMOD}.txt:${KMOD}:1.0.0.0
 
 # You can have additional configuration files in the ${T5FW} directory.
 # t5fw_cfg_<name>.txt
@@ -13,13 +14,13 @@
 CFG_FILES != cd ${T5FW} && echo ${KMOD}_*.txt
 .for F in ${CFG_FILES}
 .if exists(${F})
-FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
+FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T5FW_VER = 1.8.22.0
-FIRMWS += t5fw.fw:t5fw:${T5FW_VER}
-CLEANFILES += t5fw.fw
+T5FW_VER=	1.16.63.0
+FIRMWS+=	t5fw.fw:t5fw:${T5FW_VER}
+CLEANFILES+=	t5fw.fw
 
 t5fw.fw: t5fw-${T5FW_VER}.bin.uu
 	uudecode -o ${.TARGET} ${.ALLSRC}

Modified: trunk/sys/modules/cxgbe/tom/Makefile
===================================================================
--- trunk/sys/modules/cxgbe/tom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/cxgbe/tom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,17 +1,25 @@
 # $MidnightBSD$
 #
-# $FreeBSD: stable/9/sys/modules/cxgbe/tom/Makefile 247434 2013-02-28 00:44:54Z np $
+# $FreeBSD: stable/10/sys/modules/cxgbe/tom/Makefile 270297 2014-08-21 19:54:02Z np $
 #
 
 .include <bsd.own.mk>
 
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${.CURDIR}/../../../dev/cxgbe
 .PATH: ${CXGBE}/tom
 
-KMOD = t4_tom
-SRCS = t4_tom.c t4_connect.c t4_listen.c t4_cpl_io.c t4_tom_l2t.c t4_ddp.c
-SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h opt_inet6.h
+KMOD=	t4_tom
+SRCS=	bus_if.h
+SRCS+=	device_if.h
+SRCS+=	opt_inet.h
+SRCS+=	opt_inet6.h
+SRCS+=	pci_if.h
+SRCS+=	t4_connect.c
+SRCS+=	t4_cpl_io.c
+SRCS+=	t4_ddp.c
+SRCS+=	t4_listen.c
+SRCS+=	t4_tom.c
+SRCS+=	t4_tom_l2t.c
 
 CFLAGS+= -I${CXGBE}
 

Modified: trunk/sys/modules/dc/Makefile
===================================================================
--- trunk/sys/modules/dc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/dc/Makefile,v 1.8 2005/10/18 06:11:08 imp Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dc/Makefile 151438 2005-10-18 06:11:08Z imp $
 
 .PATH: ${.CURDIR}/../../dev/dc
 

Modified: trunk/sys/modules/dcons/Makefile
===================================================================
--- trunk/sys/modules/dcons/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dcons/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,6 @@
 # $MidnightBSD$
+# $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $
+# $FreeBSD: stable/10/sys/modules/dcons/Makefile 225214 2011-08-27 14:24:27Z rwatson $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 

Modified: trunk/sys/modules/dcons_crom/Makefile
===================================================================
--- trunk/sys/modules/dcons_crom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dcons_crom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.3 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.6 2003/10/24 15:43:24 simokawa Exp $
+# $FreeBSD: stable/10/sys/modules/dcons_crom/Makefile 136468 2004-10-13 05:41:09Z simokawa $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 

Modified: trunk/sys/modules/de/Makefile
===================================================================
--- trunk/sys/modules/de/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/de/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/de/Makefile,v 1.7 2006/02/26 17:51:22 imp Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/de/Makefile 156033 2006-02-26 17:51:22Z imp $
 
 .PATH: ${.CURDIR}/../../dev/de
 

Modified: trunk/sys/modules/digi/Makefile
===================================================================
--- trunk/sys/modules/digi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/Makefile 245952 2013-01-26 22:08:21Z pfg $
 
 SUBDIR=	digi
 SUBDIR+=digi_CX


Property changes on: trunk/sys/modules/digi/Makefile
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/sys/modules/digi/Makefile.inc
===================================================================
--- trunk/sys/modules/digi/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/digi/Makefile.inc 245952 2013-01-26 22:08:21Z pfg $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/digi/Makefile.inc
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/digi/digi/Makefile
===================================================================
--- trunk/sys/modules/digi/digi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi

Modified: trunk/sys/modules/digi/digi_CX/Makefile
===================================================================
--- trunk/sys/modules/digi/digi_CX/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi_CX/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi_CX/Makefile 76195 2001-05-02 01:08:09Z brian $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_CX

Modified: trunk/sys/modules/digi/digi_CX_PCI/Makefile
===================================================================
--- trunk/sys/modules/digi/digi_CX_PCI/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi_CX_PCI/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi_CX_PCI/Makefile 76195 2001-05-02 01:08:09Z brian $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_CX_PCI

Modified: trunk/sys/modules/digi/digi_EPCX/Makefile
===================================================================
--- trunk/sys/modules/digi/digi_EPCX/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi_EPCX/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi_EPCX/Makefile 76195 2001-05-02 01:08:09Z brian $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_EPCX

Modified: trunk/sys/modules/digi/digi_EPCX_PCI/Makefile
===================================================================
--- trunk/sys/modules/digi/digi_EPCX_PCI/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi_EPCX_PCI/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi_EPCX_PCI/Makefile 76195 2001-05-02 01:08:09Z brian $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_EPCX_PCI

Modified: trunk/sys/modules/digi/digi_Xe/Makefile
===================================================================
--- trunk/sys/modules/digi/digi_Xe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi_Xe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi_Xe/Makefile 76195 2001-05-02 01:08:09Z brian $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xe

Modified: trunk/sys/modules/digi/digi_Xem/Makefile
===================================================================
--- trunk/sys/modules/digi/digi_Xem/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi_Xem/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi_Xem/Makefile 76195 2001-05-02 01:08:09Z brian $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xem

Modified: trunk/sys/modules/digi/digi_Xr/Makefile
===================================================================
--- trunk/sys/modules/digi/digi_Xr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/digi/digi_Xr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/digi/digi_Xr/Makefile 76195 2001-05-02 01:08:09Z brian $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xr

Modified: trunk/sys/modules/dpms/Makefile
===================================================================
--- trunk/sys/modules/dpms/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dpms/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,6 @@
-# $MidnightBSD: src/sys/modules/dpms/Makefile,v 1.1 2012/03/31 16:59:45 laffer1 Exp $
-# $FreeBSD: src/sys/modules/dpms/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dpms/Makefile 198251 2009-10-19 20:58:10Z jkim $
 
-.PATH: ${.CURDIR}/../../i386/isa
-
 KMOD=	dpms
 SRCS=	bus_if.h device_if.h pci_if.h
 

Modified: trunk/sys/modules/dpt/Makefile
===================================================================
--- trunk/sys/modules/dpt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dpt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dpt/Makefile 168600 2007-04-10 20:33:31Z marius $
 #
 
 .PATH:	${.CURDIR}/../../dev/dpt

Modified: trunk/sys/modules/drm/Makefile
===================================================================
--- trunk/sys/modules/drm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/Makefile 230972 2012-02-04 00:54:43Z rmh $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/drm/Makefile.inc
===================================================================
--- trunk/sys/modules/drm/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/drm/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/drm/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/drm/drm/Makefile
===================================================================
--- trunk/sys/modules/drm/drm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/drm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/drm/Makefile 203287 2010-01-31 14:25:29Z rnoland $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= drm

Modified: trunk/sys/modules/drm/i915/Makefile
===================================================================
--- trunk/sys/modules/drm/i915/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/i915/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/i915/Makefile 182080 2008-08-23 20:59:12Z rnoland $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= i915

Modified: trunk/sys/modules/drm/mach64/Makefile
===================================================================
--- trunk/sys/modules/drm/mach64/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/mach64/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/mach64/Makefile 145132 2005-04-16 03:44:47Z anholt $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= mach64

Modified: trunk/sys/modules/drm/mga/Makefile
===================================================================
--- trunk/sys/modules/drm/mga/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/mga/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/mga/Makefile 124472 2004-01-13 11:28:51Z ru $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= mga

Modified: trunk/sys/modules/drm/r128/Makefile
===================================================================
--- trunk/sys/modules/drm/r128/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/r128/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/r128/Makefile 242203 2012-10-28 02:15:35Z nwhitehorn $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= r128
@@ -7,6 +8,6 @@
 
 .include <bsd.kmod.mk>
 
-CWARNFLAGS.r128_cce.c=		${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS.r128_state.c=	${NO_WUNUSED_VALUE}
+CWARNFLAGS.r128_cce.c=		-Wno-unused ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.r128_state.c=	-Wno-unused
 CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/drm/radeon/Makefile
===================================================================
--- trunk/sys/modules/drm/radeon/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/radeon/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/radeon/Makefile 242203 2012-10-28 02:15:35Z nwhitehorn $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= radeon
@@ -8,6 +9,6 @@
 
 .include <bsd.kmod.mk>
 
-CWARNFLAGS.r600_cp.c=	${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
-CWARNFLAGS.radeon_cp.c=	${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.r600_cp.c=	-Wno-unused ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.radeon_cp.c=	-Wno-unused ${NO_WCONSTANT_CONVERSION}
 CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/drm/savage/Makefile
===================================================================
--- trunk/sys/modules/drm/savage/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/savage/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/savage/Makefile 152909 2005-11-28 23:13:57Z anholt $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD= 	savage

Modified: trunk/sys/modules/drm/sis/Makefile
===================================================================
--- trunk/sys/modules/drm/sis/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/sis/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/sis/Makefile 124472 2004-01-13 11:28:51Z ru $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD= 	sis

Modified: trunk/sys/modules/drm/tdfx/Makefile
===================================================================
--- trunk/sys/modules/drm/tdfx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/tdfx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/tdfx/Makefile 124472 2004-01-13 11:28:51Z ru $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= tdfx

Modified: trunk/sys/modules/drm/via/Makefile
===================================================================
--- trunk/sys/modules/drm/via/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm/via/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm/via/Makefile 242203 2012-10-28 02:15:35Z nwhitehorn $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= via
@@ -10,7 +11,8 @@
 DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
 .endif
 
-.if !defined(DRM_NOLINUX)
+.if !defined(DRM_NOLINUX) && \
+     (${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64")
 DRM_LINUX_OPT= "\#define DRM_LINUX 1"
 .endif
 
@@ -21,6 +23,6 @@
 
 .include <bsd.kmod.mk>
 
-CWARNFLAGS.via_dma.c=		${NO_WUNUSED_VALUE}
-CWARNFLAGS.via_dmablit.c=	${NO_WUNUSED_VALUE}
+CWARNFLAGS.via_dma.c=		-Wno-unused-value
+CWARNFLAGS.via_dmablit.c=	-Wno-unused-value
 CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/drm2/Makefile
===================================================================
--- trunk/sys/modules/drm2/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm2/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,37 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm2/Makefile 291811 2015-12-04 18:44:12Z bdrewery $
 
 .include <bsd.own.mk>
 
+.if ${MACHINE_CPUARCH} == "amd64"
+_i915kms=	i915kms
+_radeonkms=	radeonkms
+. if ${MK_SOURCELESS_UCODE} != "no"
+_radeonkmsfw=	radeonkmsfw
+. endif
+.endif
+
+.if ${MACHINE_CPUARCH} == "i386"
+. if ${MACHINE} != "pc98"
+_i915kms=	i915kms
+_radeonkms=	radeonkms
+.  if ${MK_SOURCELESS_UCODE} != "no"
+_radeonkmsfw=	radeonkmsfw
+.  endif
+. endif
+.endif
+
+.if ${MACHINE_CPUARCH} == "powerpc"
+_radeonkms=	radeonkms
+. if ${MK_SOURCELESS_UCODE} != "no"
+_radeonkmsfw=	radeonkmsfw
+. endif
+.endif
+
 SUBDIR = \
 	drm2 \
-	i915kms
+	${_i915kms} \
+	${_radeonkms} \
+	${_radeonkmsfw}
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/drm2/Makefile.inc
===================================================================
--- trunk/sys/modules/drm2/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm2/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/drm2/Makefile.inc 235847 2012-05-23 17:10:22Z kib $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/drm2/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/drm2/drm2/Makefile
===================================================================
--- trunk/sys/modules/drm2/drm2/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm2/drm2/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,18 +1,19 @@
 # $MidnightBSD$
-# $FreeBSD: release/9.2.0/sys/modules/drm2/drm2/Makefile 249082 2013-04-04 05:47:50Z kib $
+# $FreeBSD: stable/10/sys/modules/drm2/drm2/Makefile 282199 2015-04-28 19:35:05Z dumbbell $
 
-.PATH:	${.CURDIR}/../../../dev/drm2
+.PATH:	${.CURDIR}/../../../dev/drm2 ${.CURDIR}/../../../dev/drm2/ttm
 KMOD	= drm2
 SRCS	= \
 	drm_agpsupport.c \
 	drm_auth.c \
 	drm_bufs.c \
+	drm_buffer.c \
 	drm_context.c \
 	drm_crtc.c \
 	drm_crtc_helper.c \
 	drm_dma.c \
+	drm_dp_helper.c \
 	drm_dp_iic_helper.c \
-	drm_drawable.c \
 	drm_drv.c \
 	drm_edid.c \
 	drm_fb_helper.c \
@@ -30,16 +31,34 @@
 	drm_modes.c \
 	drm_pci.c \
 	drm_scatter.c \
-	drm_sman.c \
 	drm_stub.c \
 	drm_sysctl.c \
-	drm_vm.c
+	drm_vm.c \
+	drm_os_freebsd.c \
+	ttm_agp_backend.c \
+	ttm_lock.c \
+	ttm_object.c \
+	ttm_tt.c \
+	ttm_bo_util.c \
+	ttm_bo.c \
+	ttm_bo_manager.c \
+	ttm_execbuf_util.c \
+	ttm_memory.c \
+	ttm_page_alloc.c \
+	ttm_bo_vm.c \
+	ati_pcigart.c
+#ttm_page_alloc_dma.c
 
-.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 SRCS	+= drm_ioc32.c
 .endif
 
 SRCS	+=device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \
-	opt_vm.h opt_compat.h
+	opt_vm.h opt_compat.h opt_syscons.h
 
+
+.if ${MACHINE_CPUARCH} == "powerpc"
+CWARNFLAGS+=-Wno-cast-qual
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/drm2/i915kms/Makefile
===================================================================
--- trunk/sys/modules/drm2/i915kms/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/drm2/i915kms/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/drm2/i915kms/Makefile 280369 2015-03-23 13:38:33Z kib $
 
 .PATH:	${.CURDIR}/../../../dev/drm2/i915
 KMOD	= i915kms
@@ -7,14 +8,17 @@
 	i915_dma.c \
 	i915_drv.c \
 	i915_gem.c \
+	i915_gem_context.c \
 	i915_gem_execbuffer.c \
 	i915_gem_evict.c \
 	i915_gem_gtt.c \
+	i915_gem_stolen.c \
 	i915_gem_tiling.c \
 	i915_irq.c \
 	i915_suspend.c \
 	intel_bios.c \
 	intel_crt.c \
+	intel_ddi.c \
 	intel_display.c \
 	intel_dp.c \
 	intel_fb.c \
@@ -25,6 +29,7 @@
 	intel_opregion.c \
 	intel_overlay.c \
 	intel_panel.c \
+	intel_pm.c \
 	intel_ringbuffer.c \
 	intel_sdvo.c \
 	intel_sprite.c \
@@ -34,7 +39,22 @@
 SRCS	+= i915_ioc32.c
 .endif
 
-SRCS	+= device_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h opt_drm.h \
-	 opt_compat.h
+SRCS	+=								\
+	opt_acpi.h							\
+	opt_compat.h							\
+	opt_drm.h							\
+	opt_syscons.h							\
+	acpi_if.h							\
+	bus_if.h							\
+	fb_if.h								\
+	device_if.h							\
+	iicbb_if.h							\
+	iicbus_if.h							\
+	pci_if.h
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.i915_debug.c=	-Wno-unused-function
+CWARNFLAGS.intel_lvds.c=	-Wno-unused
+CWARNFLAGS.intel_tv.c=		-Wno-unused
+CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/dtrace/Makefile
===================================================================
--- trunk/sys/modules/dtrace/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.4.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/Makefile 294368 2016-01-20 01:09:53Z jhb $
 
 .include <bsd.own.mk>
 .include "Makefile.inc"
@@ -12,15 +12,20 @@
 		dtrace_test	\
 		lockstat	\
 		profile		\
-		dtio		\
 		prototype	\
 		sdt		\
 		systrace
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-SUBDIR+=	fasttrap fbt systrace_linux32
+SUBDIR+=	fasttrap fbt systrace_linux
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
+SUBDIR+=	systrace_linux32
+.endif
+.if ${MACHINE_CPUARCH} == "powerpc"
+SUBDIR+=	fbt fasttrap
+.endif
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 SUBDIR+=	systrace_freebsd32
 .endif
 

Modified: trunk/sys/modules/dtrace/Makefile.inc
===================================================================
--- trunk/sys/modules/dtrace/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,9 @@
-# $MidnightBSD: src/sys/modules/dtrace/Makefile.inc,v 1.1 2012/03/28 21:16:38 laffer1 Exp $
-# $FreeBSD: src/sys/modules/dtrace/Makefile.inc,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/dtrace/Makefile.inc 282748 2015-05-11 07:54:39Z avg $
 
 IGNORE_PRAGMA=	1
 
 load	:
-	-kldload cyclic
 	-kldload dtrace
 .if ${MACHINE_CPUARCH} == "i386"
 	-kldload sdt
@@ -26,5 +25,4 @@
 	-kldunload sdt
 .endif
 	-kldunload dtrace
-	-kldunload cyclic
 	kldstat


Property changes on: trunk/sys/modules/dtrace/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/dtrace/dtmalloc/Makefile
===================================================================
--- trunk/sys/modules/dtrace/dtmalloc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/dtmalloc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/dtmalloc/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/dtmalloc/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/dtmalloc
 
@@ -12,3 +12,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/dtnfscl/Makefile
===================================================================
--- trunk/sys/modules/dtrace/dtnfscl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/dtnfscl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/dtnfscl/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../fs/nfsclient
 
@@ -11,3 +12,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/dtnfsclient/Makefile
===================================================================
--- trunk/sys/modules/dtrace/dtnfsclient/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/dtnfsclient/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/dtnfsclient/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../nfsclient
 
@@ -11,3 +12,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/dtrace/Makefile
===================================================================
--- trunk/sys/modules/dtrace/dtrace/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/dtrace/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/dtrace/Makefile 268578 2014-07-12 22:56:41Z rpaulo $
 
 ARCHDIR=	${MACHINE_CPUARCH}
 
@@ -14,9 +15,11 @@
 		dtrace_subr.c
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/x86
 SRCS+=		dis_tables.c \
 		instr_size.c
-CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel
+CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel \
+		-I${.CURDIR}/../../../cddl/dev/dtrace/x86
 .endif
 
 SRCS+=		bus_if.h device_if.h vnode_if.h
@@ -38,9 +41,10 @@
 		-I${.CURDIR}/../../../cddl/dev/dtrace \
 		-I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \
 		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../../../cddl/contrib/opensolaris/common/util \
 		-I${.CURDIR}/../../.. -DDIS_MEM
 
-CFLAGS+=	-DSMP -DDEBUG
+CFLAGS+=	-DSMP
 
 EXPORT_SYMS=	dtrace_register \
 		dtrace_unregister \
@@ -49,3 +53,10 @@
 dtrace_asm.o:  assym.s
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h
+
+CWARNFLAGS+=	-Wno-parentheses
+CWARNFLAGS+=	-Wno-uninitialized
+CWARNFLAGS+=	-Wno-cast-qual
+CWARNFLAGS+=	-Wno-unused

Modified: trunk/sys/modules/dtrace/dtrace_test/Makefile
===================================================================
--- trunk/sys/modules/dtrace/dtrace_test/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/dtrace_test/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/dtrace_test/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/dtrace_test/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/dtrace
 
@@ -6,10 +6,13 @@
 KMOD=		dtrace_test
 SRCS=		dtrace_test.c
 
+SRCS+=		opt_kdtrace.h
 SRCS+=		vnode_if.h
-		
+
 CFLAGS+=	-I${.CURDIR}/../../..
 
 CFLAGS+=	-D_KERNEL
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/dtraceall/Makefile
===================================================================
--- trunk/sys/modules/dtrace/dtraceall/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/dtraceall/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,8 @@
-# $MidnightBSD: src/sys/modules/dtrace/dtraceall/Makefile,v 1.1 2012/03/28 21:16:38 laffer1 Exp $
-# $FreeBSD: src/sys/modules/dtrace/dtraceall/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/dtraceall/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 KMOD=		dtraceall
-SRCS=		dtraceall.c opt_compat.h
+SRCS=		dtraceall.c opt_compat.h opt_nfs.h
 
 CFLAGS+=	-I${.CURDIR}/../../..
 
@@ -14,3 +14,5 @@
 .endif
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/dtraceall/dtraceall.c
===================================================================
--- trunk/sys/modules/dtrace/dtraceall/dtraceall.c	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/dtraceall/dtraceall.c	2018-05-26 21:14:14 UTC (rev 9983)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/modules/dtrace/dtraceall/dtraceall.c,v 1.2.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: stable/10/sys/modules/dtrace/dtraceall/dtraceall.c 287090 2015-08-24 03:41:14Z julian $
  */
 
 #include <sys/cdefs.h>
@@ -34,6 +34,7 @@
 #include <sys/module.h>
 #include <sys/errno.h>
 #include "opt_compat.h"
+#include "opt_nfs.h"
 
 static int
 dtraceall_modevent(module_t mod __unused, int type, void *data __unused)
@@ -63,15 +64,19 @@
 MODULE_VERSION(dtraceall, 1);
 
 /* All the DTrace modules should be dependencies here: */
-MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1);
 MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1);
-MODULE_DEPEND(dtraceall, dtio, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
+#if defined(NFSCL)
 MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
+#endif
+#if defined(NFSCLIENT)
 MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1);
+#endif
+#if defined(__amd64__) || defined(__i386__) || defined(__powerpc__)
+MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
+#endif
 #if defined(__amd64__) || defined(__i386__)
-MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
 MODULE_DEPEND(dtraceall, fasttrap, 1, 1, 1);
 #endif
 MODULE_DEPEND(dtraceall, lockstat, 1, 1, 1);

Modified: trunk/sys/modules/dtrace/fasttrap/Makefile
===================================================================
--- trunk/sys/modules/dtrace/fasttrap/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/fasttrap/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/modules/dtrace/fasttrap/Makefile,v 1.1 2012/03/28 21:18:51 laffer1 Exp $
-# $FreeBSD: src/sys/modules/dtrace/fasttrap/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/fasttrap/Makefile 268734 2014-07-16 02:02:46Z pfg $
 
 .PATH:	${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace
 
@@ -14,8 +14,18 @@
 .if ${MACHINE_CPUARCH} == "amd64" ||  ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel/dtrace
+.elif ${MACHINE_CPUARCH} == "powerpc"
+CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/powerpc
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/uts/powerpc/dtrace
 .endif
 
-CFLAGS+=	-DSMP -DDEBUG
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/common/unicode
+SRCS+=		u8_textprep.c
 
+CFLAGS+=	-DSMP
+
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h
+CWARNFLAGS+=	-Wno-cast-qual
+CWARNFLAGS+=	-Wno-unused

Modified: trunk/sys/modules/dtrace/fbt/Makefile
===================================================================
--- trunk/sys/modules/dtrace/fbt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/fbt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,14 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/fbt/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/fbt/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/fbt
 
 KMOD=		fbt
+.if ${MACHINE_CPUARCH} == "powerpc"
+SRCS=		fbt_powerpc.c
+.else
 SRCS=		fbt.c
+.endif
 SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
@@ -12,3 +16,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/lockstat/Makefile
===================================================================
--- trunk/sys/modules/dtrace/lockstat/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/lockstat/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/modules/dtrace/lockstat/Makefile,v 1.1 2012/03/28 21:16:38 laffer1 Exp $
-# $FreeBSD: src/sys/modules/dtrace/lockstat/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/lockstat/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/lockstat
 
@@ -13,3 +13,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/profile/Makefile
===================================================================
--- trunk/sys/modules/dtrace/profile/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/profile/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/profile/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/profile/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/profile
 
@@ -12,3 +12,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/prototype/Makefile
===================================================================
--- trunk/sys/modules/dtrace/prototype/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/prototype/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/prototype/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/prototype/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev
 
@@ -12,3 +12,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/sdt/Makefile
===================================================================
--- trunk/sys/modules/dtrace/sdt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/sdt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,11 +1,11 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/sdt/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/sdt/Makefile 254319 2013-08-14 08:03:57Z uqs $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/sdt
 
 KMOD=		sdt
 SRCS=		sdt.c
-SRCS+=		vnode_if.h
+SRCS+=		vnode_if.h opt_kdtrace.h
 
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
@@ -12,3 +12,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/systrace/Makefile
===================================================================
--- trunk/sys/modules/dtrace/systrace/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/systrace/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/dtrace/systrace/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/dtrace/systrace/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/systrace
 
@@ -12,3 +12,5 @@
 		-I${.CURDIR}/../../..
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/systrace_freebsd32/Makefile
===================================================================
--- trunk/sys/modules/dtrace/systrace_freebsd32/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/systrace_freebsd32/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/systrace_freebsd32/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/systrace
 
@@ -11,3 +12,5 @@
 		-I${.CURDIR}/../../.. -DFREEBSD32_SYSTRACE
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dtrace/systrace_linux32/Makefile
===================================================================
--- trunk/sys/modules/dtrace/systrace_linux32/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dtrace/systrace_linux32/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,12 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dtrace/systrace_linux32/Makefile 294368 2016-01-20 01:09:53Z jhb $
 
 .PATH: ${.CURDIR}/../../../cddl/dev/systrace
 
-.if ${MACHINE} == "amd64"
 KMOD=		systrace_linux32
-.else
-KMOD=		systrace_linux
-.endif
 
 SRCS=		systrace.c
 SRCS+=		vnode_if.h
@@ -13,6 +10,8 @@
 
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
-		-I${.CURDIR}/../../.. -DLINUX_SYSTRACE
+		-I${.CURDIR}/../../.. -DLINUX32_SYSTRACE
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/dummynet/Makefile
===================================================================
--- trunk/sys/modules/dummynet/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/dummynet/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/dummynet/Makefile 301772 2016-06-10 00:00:25Z truckman $
 
 .include <bsd.own.mk>
 
@@ -6,8 +7,9 @@
 KMOD=   dummynet
 SRCS=   ip_dummynet.c
 SRCS+= ip_dn_glue.c ip_dn_io.c
+SRCS+= dn_aqm_codel.c dn_aqm_pie.c
 SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c 
-SRCS+= dn_sched_prio.c
+SRCS+= dn_sched_prio.c dn_sched_fq_codel.c dn_sched_fq_pie.c
 SRCS+=	opt_inet6.h
 
 .if !defined(KERNBUILDDIR)

Modified: trunk/sys/modules/ed/Makefile
===================================================================
--- trunk/sys/modules/ed/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ed/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ed/Makefile 150961 2005-10-05 05:26:03Z imp $
 
 .PATH: ${.CURDIR}/../../dev/ed
 

Modified: trunk/sys/modules/elink/Makefile
===================================================================
--- trunk/sys/modules/elink/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/elink/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/elink/Makefile 112793 2003-03-29 13:42:20Z mdodd $
 #
 
 .PATH:	${.CURDIR}/../../i386/isa

Modified: trunk/sys/modules/en/Makefile
===================================================================
--- trunk/sys/modules/en/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/en/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/en/Makefile 151350 2005-10-14 23:30:17Z yar $
 
 .PATH: ${.CURDIR}/../../dev/en
 

Modified: trunk/sys/modules/ep/Makefile
===================================================================
--- trunk/sys/modules/ep/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ep/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ep/Makefile 147959 2005-07-13 14:53:59Z imp $
 
 .PATH: ${.CURDIR}/../../dev/ep
 

Modified: trunk/sys/modules/epic/Makefile
===================================================================
--- trunk/sys/modules/epic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/epic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/epic/Makefile 202006 2010-01-10 15:44:48Z marius $
 
 .PATH: ${.CURDIR}/../../sparc64/ebus
 

Modified: trunk/sys/modules/esp/Makefile
===================================================================
--- trunk/sys/modules/esp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/esp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/esp/Makefile 227006 2011-11-01 21:26:57Z marius $
 
 .PATH: ${.CURDIR}/../../dev/esp
 

Modified: trunk/sys/modules/et/Makefile
===================================================================
--- trunk/sys/modules/et/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/et/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 # $DragonFly: src/sys/dev/netif/et/Makefile,v 1.1 2007/10/12 14:12:42 sephe Exp $
-# $MidnightBSD: src/sys/modules/et/Makefile,v 1.1 2011/10/19 15:17:28 laffer1 Exp $
+# $FreeBSD: stable/10/sys/modules/et/Makefile 180925 2008-07-28 17:56:37Z antoine $
 
 .PATH: ${.CURDIR}/../../dev/et
 

Modified: trunk/sys/modules/ex/Makefile
===================================================================
--- trunk/sys/modules/ex/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ex/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ex/Makefile 129740 2004-05-26 00:53:10Z imp $
 #
 
 .PATH:	${.CURDIR}/../../dev/ex

Modified: trunk/sys/modules/exca/Makefile
===================================================================
--- trunk/sys/modules/exca/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/exca/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
- # $FreeBSD$
+# $MidnightBSD$
+ # $FreeBSD: stable/10/sys/modules/exca/Makefile 129740 2004-05-26 00:53:10Z imp $
 
 .PATH: ${.CURDIR}/../../dev/exca
 

Modified: trunk/sys/modules/ext2fs/Makefile
===================================================================
--- trunk/sys/modules/ext2fs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ext2fs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ext2fs/Makefile 296992 2016-03-17 19:28:15Z pfg $
 
 .PATH:	${.CURDIR}/../../fs/ext2fs
 KMOD=	ext2fs
 SRCS=	opt_ddb.h opt_directio.h opt_quota.h opt_suiddir.h vnode_if.h \
-	ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \
-	ext2_inode_cnv.c ext2_lookup.c ext2_subr.c ext2_vfsops.c \
-	ext2_vnops.c
+	ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_extents.c ext2_hash.c \
+	ext2_htree.c ext2_inode.c ext2_inode_cnv.c ext2_lookup.c ext2_subr.c \
+	ext2_vfsops.c ext2_vnops.c
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/fatm/Makefile
===================================================================
--- trunk/sys/modules/fatm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/fatm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/fatm/Makefile 182668 2008-09-01 23:59:00Z imp $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/fdc/Makefile
===================================================================
--- trunk/sys/modules/fdc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/fdc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $
 
 KMOD=	fdc
 

Modified: trunk/sys/modules/fdescfs/Makefile
===================================================================
--- trunk/sys/modules/fdescfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/fdescfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/fdescfs/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH: ${.CURDIR}/../../fs/fdescfs
 

Modified: trunk/sys/modules/fe/Makefile
===================================================================
--- trunk/sys/modules/fe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/fe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/fe/Makefile 129740 2004-05-26 00:53:10Z imp $
 
 .PATH: ${.CURDIR}/../../dev/fe
 

Modified: trunk/sys/modules/filemon/Makefile
===================================================================
--- trunk/sys/modules/filemon/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/filemon/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,10 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/filemon/Makefile 296015 2016-02-24 22:30:22Z bdrewery $
 
 .PATH: ${.CURDIR}/../../dev/filemon
 
 KMOD=	filemon
 SRCS=	${KMOD}.c
-SRCS+=	opt_compat.h
+SRCS+=	opt_compat.h vnode_if.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/firewire/Makefile
===================================================================
--- trunk/sys/modules/firewire/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firewire/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/firewire/Makefile 132034 2004-07-12 13:13:17Z dfr $
 
 SUBDIR=	firewire \
 	fwe \

Modified: trunk/sys/modules/firewire/Makefile.inc
===================================================================
--- trunk/sys/modules/firewire/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firewire/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/firewire/Makefile.inc 125771 2004-02-13 10:11:01Z ru $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/firewire/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/firewire/firewire/Makefile
===================================================================
--- trunk/sys/modules/firewire/firewire/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firewire/firewire/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/firewire/firewire/Makefile 155824 2006-02-18 23:49:28Z yar $
 
 # Makefile for the IEEE1394 OHCI chipset
 

Modified: trunk/sys/modules/firewire/fwe/Makefile
===================================================================
--- trunk/sys/modules/firewire/fwe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firewire/fwe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/firewire/fwe/Makefile 155824 2006-02-18 23:49:28Z yar $
 
 # Makefile for the fwe(4) module (Ethernet over IEEE1394)
 

Modified: trunk/sys/modules/firewire/fwip/Makefile
===================================================================
--- trunk/sys/modules/firewire/fwip/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firewire/fwip/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/firewire/fwip/Makefile 220371 2011-04-05 19:41:18Z uqs $
 
 # Makefile for the fwip(4) module (IP over IEEE1394)
 

Modified: trunk/sys/modules/firewire/sbp/Makefile
===================================================================
--- trunk/sys/modules/firewire/sbp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firewire/sbp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/firewire/sbp/Makefile 155824 2006-02-18 23:49:28Z yar $
 
 # Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394)
 

Modified: trunk/sys/modules/firewire/sbp_targ/Makefile
===================================================================
--- trunk/sys/modules/firewire/sbp_targ/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firewire/sbp_targ/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/firewire/sbp_targ/Makefile 155824 2006-02-18 23:49:28Z yar $
 
 # Makefile for the SBP-II Target mode
 

Modified: trunk/sys/modules/firmware/Makefile
===================================================================
--- trunk/sys/modules/firmware/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/firmware/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/firmware/Makefile 178332 2008-04-20 16:11:14Z antoine $
 
 .PATH: ${.CURDIR}/../../kern
 

Modified: trunk/sys/modules/fxp/Makefile
===================================================================
--- trunk/sys/modules/fxp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/fxp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/fxp/Makefile 226154 2011-10-08 12:33:10Z marius $
 
 .PATH: ${.CURDIR}/../../dev/fxp
 

Modified: trunk/sys/modules/gem/Makefile
===================================================================
--- trunk/sys/modules/gem/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/gem/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/gem/Makefile 212725 2010-09-16 09:29:48Z marius $
 
 .PATH: ${.CURDIR}/../../dev/gem
 

Modified: trunk/sys/modules/geom/Makefile
===================================================================
--- trunk/sys/modules/geom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,12 +1,14 @@
-# $MidnightBSD: src/sys/modules/geom/Makefile,v 1.5 2012/07/21 22:46:10 laffer1 Exp $
-# $FreeBSD: src/sys/modules/geom/Makefile,v 1.19.4.1 2008/01/24 20:28:27 lulf Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/Makefile 318159 2017-05-10 21:42:16Z marius $
 
+.include <bsd.own.mk>
+
 SUBDIR=	geom_bde \
 	geom_bsd \
 	geom_cache \
-	geom_ccd \
 	geom_concat \
 	geom_eli \
+	geom_flashmap \
 	geom_fox \
 	geom_gate \
 	geom_journal \
@@ -18,6 +20,7 @@
 	geom_multipath \
 	geom_nop \
 	geom_part \
+	geom_pc98 \
 	geom_raid \
 	geom_raid3 \
 	geom_sched \
@@ -24,6 +27,7 @@
 	geom_shsec \
 	geom_stripe \
 	geom_sunlabel \
+	geom_uncompress \
 	geom_uzip \
 	geom_vinum \
 	geom_virstor \
@@ -30,4 +34,8 @@
 	geom_vol_ffs \
 	geom_zero
 
+.if ${MK_CCD} != "no" || defined(ALL_MODULES)
+SUBDIR+=	geom_ccd
+.endif
+
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/geom/Makefile.inc
===================================================================
--- trunk/sys/modules/geom/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/geom/Makefile.inc,v 1.1 2003/06/15 04:27:22 nyan Exp $
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/geom/Makefile.inc 116380 2003-06-15 04:27:22Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/geom/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/geom/geom_bde/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_bde/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_bde/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_bde/Makefile 314327 2017-02-27 08:27:38Z avg $
 
 .PATH: ${.CURDIR}/../../../geom/bde
 .PATH: ${.CURDIR}/../../../crypto/rijndael
@@ -6,6 +7,6 @@
 
 KMOD=	geom_bde
 SRCS=	g_bde.c g_bde_crypt.c g_bde_lock.c g_bde_work.c
-SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
+SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha256c.c sha512c.c
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/geom/geom_bsd/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_bsd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_bsd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_bsd/Makefile 150373 2005-09-20 11:16:05Z imura $
 
 .PATH: ${.CURDIR}/../../../geom
 

Modified: trunk/sys/modules/geom/geom_cache/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_cache/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_cache/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_cache/Makefile 163048 2006-10-06 08:27:07Z ru $
 
 .PATH: ${.CURDIR}/../../../geom/cache
 

Modified: trunk/sys/modules/geom/geom_ccd/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_ccd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_ccd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_ccd/Makefile 116125 2003-06-09 21:49:54Z phk $
 
 .PATH: ${.CURDIR}/../../../geom
 

Modified: trunk/sys/modules/geom/geom_concat/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_concat/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_concat/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_concat/Makefile 126008 2004-02-19 15:43:58Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/concat
 

Modified: trunk/sys/modules/geom/geom_eli/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_eli/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_eli/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_eli/Makefile 220922 2011-04-21 13:31:43Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/eli
 

Modified: trunk/sys/modules/geom/geom_fox/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_fox/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_fox/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_fox/Makefile 116518 2003-06-18 09:29:28Z phk $
 
 .PATH: ${.CURDIR}/../../../geom
 

Modified: trunk/sys/modules/geom/geom_gate/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_gate/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_gate/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_gate/Makefile 128761 2004-04-30 16:09:28Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/gate
 

Modified: trunk/sys/modules/geom/geom_journal/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_journal/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_journal/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_journal/Makefile 163850 2006-10-31 22:21:47Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/journal
 

Modified: trunk/sys/modules/geom/geom_label/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_label/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_label/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,11 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_label/Makefile 249581 2013-04-17 09:19:29Z ivoras $
 
 .PATH: ${.CURDIR}/../../../geom/label
 
 KMOD=	geom_label
 SRCS=	g_label.c
+SRCS+=	g_label_disk_ident.c
 SRCS+=	g_label_ext2fs.c
 SRCS+=	g_label_gpt.c
 SRCS+=	g_label_iso9660.c

Modified: trunk/sys/modules/geom/geom_linux_lvm/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_linux_lvm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_linux_lvm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/geom/geom_linux_lvm/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/geom/geom_linux_lvm/Makefile 176418 2008-02-20 07:50:13Z thompsa $
 
 .PATH: ${.CURDIR}/../../../geom/linux_lvm
 

Modified: trunk/sys/modules/geom/geom_mbr/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_mbr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_mbr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_mbr/Makefile 117254 2003-07-05 08:11:43Z jmg $
 
 .PATH: ${.CURDIR}/../../../geom
 

Modified: trunk/sys/modules/geom/geom_mirror/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_mirror/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_mirror/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_mirror/Makefile 132904 2004-07-30 23:13:45Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/mirror
 

Modified: trunk/sys/modules/geom/geom_mountver/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_mountver/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_mountver/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_mountver/Makefile 202437 2010-01-16 09:52:49Z trasz $
 
 .PATH: ${.CURDIR}/../../../geom/mountver
 

Modified: trunk/sys/modules/geom/geom_multipath/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_multipath/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_multipath/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_multipath/Makefile 167050 2007-02-27 04:01:58Z mjacob $
 
 .PATH: ${.CURDIR}/../../../geom/multipath
 

Modified: trunk/sys/modules/geom/geom_nop/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_nop/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_nop/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_nop/Makefile 129475 2004-05-20 10:27:20Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/nop
 

Modified: trunk/sys/modules/geom/geom_part/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,14 @@
-# $MidnightBSD: src/sys/modules/geom/geom_part/Makefile,v 1.1 2011/07/13 01:09:48 laffer1 Exp $
-# $FreeBSD: src/sys/modules/geom/geom_part/Makefile,v 1.3.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/Makefile 268091 2014-07-01 13:29:17Z ae $
 
 SUBDIR=	geom_part_apm \
 	geom_part_bsd \
+	geom_part_bsd64 \
+	geom_part_ebr \
 	geom_part_gpt \
+	geom_part_ldm \
 	geom_part_mbr \
+	geom_part_pc98 \
 	geom_part_vtoc8
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/geom/geom_part/geom_part_apm/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_apm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_apm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/geom/geom_part/geom_part_apm/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_apm/Makefile 177512 2008-03-23 01:42:47Z marcel $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_part/geom_part_bsd/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_bsd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_bsd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/geom/geom_part/geom_part_bsd/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_bsd/Makefile 177512 2008-03-23 01:42:47Z marcel $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_part/geom_part_ebr/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_ebr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_ebr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_ebr/Makefile 193123 2009-05-30 22:04:18Z marcel $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_part/geom_part_gpt/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_gpt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_gpt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/geom/geom_part/geom_part_gpt/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_gpt/Makefile 177512 2008-03-23 01:42:47Z marcel $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_part/geom_part_ldm/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_ldm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_ldm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_ldm/Makefile 233177 2012-03-19 13:15:48Z ae $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_part/geom_part_mbr/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_mbr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_mbr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/geom/geom_part/geom_part_mbr/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_mbr/Makefile 177512 2008-03-23 01:42:47Z marcel $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_part/geom_part_pc98/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_pc98/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_pc98/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_pc98/Makefile 177692 2008-03-28 17:58:55Z marcel $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile 177512 2008-03-23 01:42:47Z marcel $
 
 .PATH: ${.CURDIR}/../../../../geom/part
 

Modified: trunk/sys/modules/geom/geom_raid/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_raid/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_raid/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_raid/Makefile 234848 2012-04-30 17:53:02Z mav $
 
 .PATH: ${.CURDIR}/../../../geom/raid
 

Modified: trunk/sys/modules/geom/geom_raid3/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_raid3/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_raid3/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_raid3/Makefile 133808 2004-08-16 06:23:14Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/raid3
 

Modified: trunk/sys/modules/geom/geom_sched/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_sched/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_sched/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_sched/Makefile 206497 2010-04-12 16:37:45Z luigi $
 
 SUBDIR=	gs_sched gsched_rr
 

Modified: trunk/sys/modules/geom/geom_sched/Makefile.inc
===================================================================
--- trunk/sys/modules/geom/geom_sched/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_sched/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/geom/geom_sched/Makefile.inc 206497 2010-04-12 16:37:45Z luigi $
 # included by geom_sched children
 
 .PATH: ${.CURDIR}/../../../../geom/sched


Property changes on: trunk/sys/modules/geom/geom_sched/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/geom/geom_sched/gs_sched/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_sched/gs_sched/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_sched/gs_sched/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_sched/gs_sched/Makefile 206497 2010-04-12 16:37:45Z luigi $
 KMOD=   geom_sched
 SRCS=   g_sched.c subr_disk.c
 

Modified: trunk/sys/modules/geom/geom_sched/gsched_rr/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_sched/gsched_rr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_sched/gsched_rr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_sched/gsched_rr/Makefile 206497 2010-04-12 16:37:45Z luigi $
 
 KMOD=   gsched_rr
 SRCS=   gs_rr.c

Modified: trunk/sys/modules/geom/geom_shsec/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_shsec/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_shsec/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_shsec/Makefile 140074 2005-01-11 18:06:44Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/shsec
 

Modified: trunk/sys/modules/geom/geom_stripe/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_stripe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_stripe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_stripe/Makefile 129475 2004-05-20 10:27:20Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/stripe
 

Modified: trunk/sys/modules/geom/geom_sunlabel/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_sunlabel/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_sunlabel/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_sunlabel/Makefile 115479 2003-05-31 18:36:41Z phk $
 
 .PATH: ${.CURDIR}/../../../geom
 

Modified: trunk/sys/modules/geom/geom_uncompress/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_uncompress/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_uncompress/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_uncompress/Makefile 266220 2014-05-16 14:28:55Z loos $
 
 .PATH: ${.CURDIR}/../../../geom/uncompress \
     ${.CURDIR}/../../../contrib/xz-embedded/freebsd/ \
@@ -7,11 +8,11 @@
     ${.CURDIR}/../../../net
 
 KMOD=	geom_uncompress
-CFLAGS= -I${.CURDIR}/../../../geom/uncompress/ \
+CFLAGS+= -I${.CURDIR}/../../../geom/uncompress/ \
 	-I${.CURDIR}/../../../contrib/xz-embedded/freebsd \
 	-I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/
 SRCS=	g_uncompress.c xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \
-    xz_malloc.c zlib.c
+    xz_malloc.c
 SRCS+=	xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h zlib.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/geom/geom_uzip/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_uzip/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_uzip/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,26 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_uzip/Makefile 315119 2017-03-12 04:41:27Z ngie $
 
 .PATH: ${.CURDIR}/../../../geom/uzip ${.CURDIR}/../../../net
 
 KMOD=	geom_uzip
-SRCS=	g_uzip.c
+SRCS=	g_uzip.c g_uzip_zlib.c g_uzip_lzma.c g_uzip_wrkthr.c
+SRCS+=	g_uzip.h g_uzip_dapi.h g_uzip_lzma.h g_uzip_zlib.h g_uzip_softc.h \
+    g_uzip_wrkthr.h
 #CFLAGS=	-g -DINVARIANT_SUPPORT -DINVARIANTS
 
+SRCS+=	opt_geom.h
+
+.PATH: ${.CURDIR}/../../../contrib/xz-embedded/freebsd/ \
+	${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ \
+	${.CURDIR}/../../../contrib/xz-embedded/linux/include/linux/ \
+	${.CURDIR}/../../../net
+
+CFLAGS+= -I${.CURDIR}/../../../contrib/xz-embedded/freebsd \
+	-I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/
+SRCS+=	xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \
+    xz_malloc.c
+SRCS+=  xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h
+SRCS+=	opt_geom.h
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/geom/geom_vinum/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_vinum/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_vinum/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_vinum/Makefile 190507 2009-03-28 17:20:08Z lulf $
 
 .PATH: ${.CURDIR}/../../../geom/vinum
 

Modified: trunk/sys/modules/geom/geom_virstor/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_virstor/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_virstor/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_virstor/Makefile 172302 2007-09-23 07:34:23Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/virstor
 

Modified: trunk/sys/modules/geom/geom_vol_ffs/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_vol_ffs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_vol_ffs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_vol_ffs/Makefile 115783 2003-06-03 20:32:13Z gordon $
 
 .PATH: ${.CURDIR}/../../../geom
 

Modified: trunk/sys/modules/geom/geom_zero/Makefile
===================================================================
--- trunk/sys/modules/geom/geom_zero/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/geom/geom_zero/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/geom/geom_zero/Makefile 148382 2005-07-25 10:03:16Z pjd $
 
 .PATH: ${.CURDIR}/../../../geom/zero
 

Modified: trunk/sys/modules/glxiic/Makefile
===================================================================
--- trunk/sys/modules/glxiic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/glxiic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/glxiic/Makefile 221961 2011-05-15 14:01:23Z brix $
 
 #CFLAGS+=	-DGLXIIC_DEBUG
 

Modified: trunk/sys/modules/glxsb/Makefile
===================================================================
--- trunk/sys/modules/glxsb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/glxsb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/glxsb/Makefile 181467 2008-08-09 14:52:31Z philip $
 
 .PATH:	${.CURDIR}/../../dev/glxsb
 KMOD	= glxsb

Modified: trunk/sys/modules/hatm/Makefile
===================================================================
--- trunk/sys/modules/hatm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hatm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/hatm/Makefile 182668 2008-09-01 23:59:00Z imp $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/hifn/Makefile
===================================================================
--- trunk/sys/modules/hifn/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hifn/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/hifn/Makefile,v 1.6 2007/03/21 03:42:50 sam Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/hifn/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH:	${.CURDIR}/../../dev/hifn
 KMOD	= hifn

Modified: trunk/sys/modules/hme/Makefile
===================================================================
--- trunk/sys/modules/hme/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hme/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/hme/Makefile 178762 2008-05-04 14:59:25Z marius $
 
 .PATH: ${.CURDIR}/../../dev/hme
 

Modified: trunk/sys/modules/hpt27xx/Makefile
===================================================================
--- trunk/sys/modules/hpt27xx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hpt27xx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/hpt27xx/Makefile 252867 2013-07-06 07:49:41Z delphij $
 HPT27XX=	${.CURDIR}/../../dev/hpt27xx
 .PATH:	${HPT27XX}
 
@@ -5,7 +6,7 @@
 KMOD=	hpt27xx
 SRCS=	bus_if.h device_if.h pci_if.h
 SRCS+=	opt_cam.h opt_scsi.h
-SRCS+=	os_bsd.h os_bsd.c osm_bsd.c hpt27xx_config.c
+SRCS+=	os_bsd.h hpt27xx_os_bsd.c hpt27xx_osm_bsd.c hpt27xx_config.c
 OBJS+=	hpt27xx_lib.o
 
 hpt27xx_lib.o:

Modified: trunk/sys/modules/hptiop/Makefile
===================================================================
--- trunk/sys/modules/hptiop/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hptiop/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/hptiop/Makefile 169412 2007-05-09 07:07:26Z scottl $
 
 .PATH: ${.CURDIR}/../../dev/hptiop
 

Modified: trunk/sys/modules/hptmv/Makefile
===================================================================
--- trunk/sys/modules/hptmv/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hptmv/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
+# $MidnightBSD$
 #
 # Makefile for RR182x FreeBSD driver
 # Copyright (c)  2004-2005 HighPoint Technologies, Inc. All rights reserved
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/hptmv/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 HPTMV= ${.CURDIR}/../../dev/hptmv
 .PATH: ${HPTMV}

Modified: trunk/sys/modules/hptrr/Makefile
===================================================================
--- trunk/sys/modules/hptrr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hptrr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.2 2012-07-21 15:16:46 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile.def,v 1.18 2007/03/22 11:20:15 gmm Exp $
+# $FreeBSD: stable/10/sys/modules/hptrr/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 HPTRR=  ${.CURDIR}/../../dev/hptrr
 .PATH: ${HPTRR}

Modified: trunk/sys/modules/hwpmc/Makefile
===================================================================
--- trunk/sys/modules/hwpmc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/hwpmc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,7 @@
 # $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/hwpmc/Makefile 263132 2014-03-14 02:37:07Z jhibbits $
+#
 
 .PATH: ${.CURDIR}/../../dev/hwpmc
 
@@ -12,6 +15,10 @@
 SRCS+=	device_if.h bus_if.h
 .endif
 
+.if ${MACHINE_CPUARCH} == "arm"
+SRCS+=	hwpmc_arm.c
+.endif
+
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_ppro.c
 SRCS+=	hwpmc_pentium.c hwpmc_tsc.c hwpmc_x86.c hwpmc_uncore.c
@@ -18,4 +25,16 @@
 SRCS+=	device_if.h bus_if.h
 .endif
 
+.if ${MACHINE_CPUARCH} == "ia64"
+SRCS+=	hwpmc_ia64.c
+.endif
+
+.if ${MACHINE_CPUARCH} == "powerpc"
+SRCS+=	hwpmc_powerpc.c hwpmc_mpc7xxx.c hwpmc_ppc970.c
+.endif
+
+.if ${MACHINE_CPUARCH} == "sparc64"
+SRCS+=	hwpmc_sparc64.c
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/i2c/Makefile
===================================================================
--- trunk/sys/modules/i2c/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/Makefile 330109 2018-02-28 10:00:02Z rpokala $
 
 SUBDIR =
-SUBDIR += controllers if_ic smbus iicbus iicbb iicsmb iic smb
+SUBDIR += controllers if_ic smbus iicbus iicbb iicsmb iic smb jedec_ts
+SUBDIR += jedec_dimm
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/i2c/Makefile.inc
===================================================================
--- trunk/sys/modules/i2c/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/i2c/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/i2c/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/i2c/controllers/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,14 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/Makefile 330680 2018-03-09 02:55:27Z rpokala $
 
 .if ${MACHINE} == "pc98"
 SUBDIR = lpbb
 .else
-SUBDIR = alpm amdpm amdsmb ichsmb intpm nfsmb viapm lpbb pcf
+SUBDIR = alpm amdpm amdsmb ichsmb intpm ismt nfsmb viapm lpbb pcf
 .endif
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+SUBDIR += imcsmb
+.endif
+
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/i2c/controllers/Makefile.inc
===================================================================
--- trunk/sys/modules/i2c/controllers/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/i2c/controllers/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/i2c/controllers/alpm/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/alpm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/alpm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/alpm/Makefile 171020 2007-06-24 20:35:59Z njl $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= alpm

Modified: trunk/sys/modules/i2c/controllers/amdpm/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/amdpm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/amdpm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/amdpm/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= amdpm

Modified: trunk/sys/modules/i2c/controllers/amdsmb/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/amdsmb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/amdsmb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/amdsmb/Makefile 153618 2005-12-21 15:49:51Z ru $
 
 .PATH: ${.CURDIR}/../../../../pci
 

Modified: trunk/sys/modules/i2c/controllers/ichsmb/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/ichsmb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/ichsmb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-#$FreeBSD$
+# $MidnightBSD$
+#$FreeBSD: stable/10/sys/modules/i2c/controllers/ichsmb/Makefile 146996 2005-06-05 11:55:29Z takawata $
 
 .PATH:		${.CURDIR}/../../../../dev/ichsmb
 KMOD		= ichsmb

Modified: trunk/sys/modules/i2c/controllers/intpm/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/intpm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/intpm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/intpm/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= intpm

Modified: trunk/sys/modules/i2c/controllers/lpbb/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/lpbb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/lpbb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/lpbb/Makefile 116349 2003-06-14 20:43:33Z jmg $
 
 .PATH:		${.CURDIR}/../../../../dev/ppbus
 KMOD		= lpbb

Modified: trunk/sys/modules/i2c/controllers/nfsmb/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/nfsmb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/nfsmb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/nfsmb/Makefile 153618 2005-12-21 15:49:51Z ru $
 
 .PATH: ${.CURDIR}/../../../../pci
 

Modified: trunk/sys/modules/i2c/controllers/pcf/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/pcf/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/pcf/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/pcf/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../../../dev/pcf
 

Modified: trunk/sys/modules/i2c/controllers/viapm/Makefile
===================================================================
--- trunk/sys/modules/i2c/controllers/viapm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/controllers/viapm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/controllers/viapm/Makefile 171020 2007-06-24 20:35:59Z njl $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= viapm

Modified: trunk/sys/modules/i2c/if_ic/Makefile
===================================================================
--- trunk/sys/modules/i2c/if_ic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/if_ic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/if_ic/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= if_ic

Modified: trunk/sys/modules/i2c/iic/Makefile
===================================================================
--- trunk/sys/modules/i2c/iic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/iic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/iic/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iic

Modified: trunk/sys/modules/i2c/iicbb/Makefile
===================================================================
--- trunk/sys/modules/i2c/iicbb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/iicbb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/iicbb/Makefile 266105 2014-05-15 01:27:53Z loos $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicbb
 SRCS		= device_if.h bus_if.h iicbus_if.h \
-		  iicbb_if.h iicbb_if.c iicbb.c
+		  iicbb_if.h iicbb_if.c iicbb.c opt_platform.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/i2c/iicbus/Makefile
===================================================================
--- trunk/sys/modules/i2c/iicbus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/iicbus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/iicbus/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicbus

Modified: trunk/sys/modules/i2c/iicsmb/Makefile
===================================================================
--- trunk/sys/modules/i2c/iicsmb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/iicsmb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/iicsmb/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicsmb

Modified: trunk/sys/modules/i2c/smb/Makefile
===================================================================
--- trunk/sys/modules/i2c/smb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/smb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/smb/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../dev/smbus
 KMOD		= smb

Modified: trunk/sys/modules/i2c/smbus/Makefile
===================================================================
--- trunk/sys/modules/i2c/smbus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/i2c/smbus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/i2c/smbus/Makefile 93023 2002-03-23 15:49:15Z nsouch $
 
 .PATH:		${.CURDIR}/../../../dev/smbus
 KMOD		= smbus

Modified: trunk/sys/modules/ibcs2/Makefile
===================================================================
--- trunk/sys/modules/ibcs2/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ibcs2/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/modules/ibcs2/Makefile,v 1.2 2009/01/18 00:02:19 laffer1 Exp $
-# $FreeBSD: src/sys/modules/ibcs2/Makefile,v 1.34 2002/08/12 07:20:15 alfred Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ibcs2/Makefile 193588 2009-06-06 17:01:44Z rwatson $
 
 .PATH: ${.CURDIR}/../../i386/ibcs2
 

Modified: trunk/sys/modules/ichwd/Makefile
===================================================================
--- trunk/sys/modules/ichwd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ichwd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ichwd/Makefile 199015 2009-11-07 11:41:23Z avg $
 
 .PATH: ${.CURDIR}/../../dev/ichwd
 

Modified: trunk/sys/modules/ida/Makefile
===================================================================
--- trunk/sys/modules/ida/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ida/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ida/Makefile 124367 2004-01-11 07:01:30Z mdodd $
 
 .PATH:	${.CURDIR}/../../dev/ida
 

Modified: trunk/sys/modules/ie/Makefile
===================================================================
--- trunk/sys/modules/ie/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ie/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ie/Makefile 140867 2005-01-26 16:29:07Z imp $
 #
 
 .PATH:	${.CURDIR}/../../dev/ie

Modified: trunk/sys/modules/if_bridge/Makefile
===================================================================
--- trunk/sys/modules/if_bridge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_bridge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_bridge/Makefile 160730 2006-07-26 22:15:15Z thompsa $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/if_carp/Makefile
===================================================================
--- trunk/sys/modules/if_carp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_carp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../netinet

Modified: trunk/sys/modules/if_disc/Makefile
===================================================================
--- trunk/sys/modules/if_disc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_disc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_disc/Makefile 151350 2005-10-14 23:30:17Z yar $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_edsc/Makefile
===================================================================
--- trunk/sys/modules/if_edsc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_edsc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_edsc/Makefile 167891 2007-03-26 04:39:18Z yar $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_ef/Makefile
===================================================================
--- trunk/sys/modules/if_ef/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_ef/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_ef/Makefile 193744 2009-06-08 19:57:35Z bz $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_epair/Makefile
===================================================================
--- trunk/sys/modules/if_epair/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_epair/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_epair/Makefile 195892 2009-07-26 12:20:07Z bz $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_faith/Makefile
===================================================================
--- trunk/sys/modules/if_faith/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_faith/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_faith/Makefile 151350 2005-10-14 23:30:17Z yar $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_gif/Makefile
===================================================================
--- trunk/sys/modules/if_gif/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_gif/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_gif/Makefile 294025 2016-01-14 17:44:45Z sbruno $
 
 .include <bsd.own.mk>
 
@@ -5,12 +6,21 @@
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
 KMOD=	if_gif
-SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
+SRCS=	if_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
+.endif
+.else
+OPT_INET!= cat ${KERNBUILDDIR}/opt_inet.h; echo
+.if empty(OPT_INET)
+MK_INET_SUPPORT= no
+.endif
+.endif
 
+.if !defined(KERNBUILDDIR)
 .if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
@@ -19,12 +29,16 @@
 opt_mrouting.h:
 	echo "#define MROUTING 1" > ${.TARGET}
 .else
-OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h
+OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
 .if empty(OPT_INET6)
 MK_INET6_SUPPORT= no
 .endif
 .endif
 
+.if ${MK_INET_SUPPORT} != "no"
+SRCS+=	in_gif.c
+.endif
+
 .if ${MK_INET6_SUPPORT} != "no"
 SRCS+=	in6_gif.c
 .endif

Modified: trunk/sys/modules/if_gre/Makefile
===================================================================
--- trunk/sys/modules/if_gre/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_gre/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,19 +1,37 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_gre/Makefile 284066 2015-06-06 12:44:42Z ae $
+.include <bsd.own.mk>
 
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
 KMOD=	if_gre
-SRCS=	if_gre.c ip_gre.c opt_inet.h opt_inet6.h opt_atalk.h
+SRCS=	if_gre.c opt_inet.h opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
 
+.if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
+.endif
+.else
+OPT_INET!= cat ${KERNBUILDDIR}/opt_inet.h; echo
+.if empty(OPT_INET)
+MK_INET_SUPPORT=no
+.endif
+OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
+.if empty(OPT_INET6)
+MK_INET6_SUPPORT=no
+.endif
+.endif
 
-opt_atalk.h:
-	echo "#define NETATALK 1" > ${.TARGET}
+.if ${MK_INET_SUPPORT} != "no"
+SRCS+=  ip_gre.c
 .endif
 
+.if ${MK_INET6_SUPPORT} != "no"
+SRCS+=  ip6_gre.c
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/if_lagg/Makefile
===================================================================
--- trunk/sys/modules/if_lagg/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_lagg/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_lagg/Makefile 168793 2007-04-17 00:35:11Z thompsa $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/if_ndis/Makefile
===================================================================
--- trunk/sys/modules/if_ndis/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_ndis/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_ndis/Makefile 189488 2009-03-07 07:26:22Z weongyo $
 
 .PATH: ${.CURDIR}/../../dev/if_ndis
 

Modified: trunk/sys/modules/if_stf/Makefile
===================================================================
--- trunk/sys/modules/if_stf/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_stf/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_stf/Makefile 193588 2009-06-06 17:01:44Z rwatson $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_tap/Makefile
===================================================================
--- trunk/sys/modules/if_tap/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_tap/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
+# $MidnightBSD$
 # Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin at yahoo.com>
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/if_tap/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_tun/Makefile
===================================================================
--- trunk/sys/modules/if_tun/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_tun/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_tun/Makefile 193588 2009-06-06 17:01:44Z rwatson $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/if_vlan/Makefile
===================================================================
--- trunk/sys/modules/if_vlan/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/if_vlan/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/if_vlan/Makefile,v 1.5.6.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/if_vlan/Makefile 193744 2009-06-08 19:57:35Z bz $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/iir/Makefile
===================================================================
--- trunk/sys/modules/iir/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iir/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iir/Makefile 89580 2002-01-20 08:51:08Z msmith $
 
 KMOD		=  iir
 .PATH:		${.CURDIR}/../../dev/${KMOD}

Modified: trunk/sys/modules/io/Makefile
===================================================================
--- trunk/sys/modules/io/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/io/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/io/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../dev/io
 .PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH}

Modified: trunk/sys/modules/ip6_mroute_mod/Makefile
===================================================================
--- trunk/sys/modules/ip6_mroute_mod/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ip6_mroute_mod/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ip6_mroute_mod/Makefile 254985 2013-08-28 07:48:44Z uqs $
 
 .include <bsd.own.mk>
 
@@ -7,7 +8,7 @@
 KMOD=	ip6_mroute
 
 SRCS=	ip6_mroute.c
-SRCS+=	opt_inet6.h opt_mrouting.h
+SRCS+=	opt_inet6.h opt_kdtrace.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet6.h:

Modified: trunk/sys/modules/ip_mroute_mod/Makefile
===================================================================
--- trunk/sys/modules/ip_mroute_mod/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ip_mroute_mod/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ip_mroute_mod/Makefile 193744 2009-06-08 19:57:35Z bz $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/ipdivert/Makefile
===================================================================
--- trunk/sys/modules/ipdivert/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipdivert/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,13 +1,22 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipdivert/Makefile 231838 2012-02-16 21:57:50Z uqs $
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../netinet
 
 KMOD=   ipdivert
-SRCS=   ip_divert.c opt_inet6.h
+SRCS=   ip_divert.c opt_inet.h opt_inet6.h opt_sctp.h
 
 .if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	echo "#define INET 1" > ${.TARGET}
+.endif
+.if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
 .endif
+.endif
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/ipfilter/Makefile
===================================================================
--- trunk/sys/modules/ipfilter/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipfilter/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$ 
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipfilter/Makefile 260274 2014-01-04 18:33:28Z dim $ 
 
 .include <bsd.own.mk>
 
@@ -7,7 +8,8 @@
 KMOD=	ipl
 SRCS=	mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
 	ip_log.c ip_fil_freebsd.c fil.c ip_lookup.c ip_pool.c ip_htable.c \
-	ip_sync.c
+	ip_sync.c \
+	ip_nat6.c ip_rules.c ip_scan.c ip_dstlist.c radix_ipf.c
 SRCS+=	opt_bpf.h opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
@@ -27,7 +29,18 @@
 
 .include <bsd.kmod.mk>
 
-CWARNFLAGS.fil.c=		${NO_WSELF_ASSIGN}
-CWARNFLAGS.ip_proxy.c=		${NO_WSELF_ASSIGN}
-CWARNFLAGS.ip_lookup.c=		${NO_WSELF_ASSIGN}
+CWARNFLAGS.fil.c=		${NO_WSELF_ASSIGN} -Wno-unused
+CWARNFLAGS.ip_auth.c=		-Wno-unused
+CWARNFLAGS.ip_fil_freebsd.c=	-Wno-unused
+CWARNFLAGS.ip_frag.c=		-Wno-unused
+CWARNFLAGS.ip_htable.c=		-Wno-unused
+CWARNFLAGS.ip_dstlist.c=	-Wno-unused
+CWARNFLAGS.ip_lookup.c=		${NO_WSELF_ASSIGN} -Wno-unused
+CWARNFLAGS.ip_nat.c=		-Wno-unused
+CWARNFLAGS.ip_nat6.c=		-Wno-unused
+CWARNFLAGS.ip_pool.c=		-Wno-unused
+CWARNFLAGS.ip_proxy.c=		${NO_WSELF_ASSIGN} -Wno-unused
+CWARNFLAGS.ip_scan.c=		-Wno-unused
+CWARNFLAGS.ip_state.c=		-Wno-unused
+CWARNFLAGS.ip_sync.c=		-Wno-unused
 CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/ipfw/Makefile
===================================================================
--- trunk/sys/modules/ipfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.26 2007/07/03 12:46:06 mlaier Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipfw/Makefile 240494 2012-09-14 11:51:49Z glebius $
 
 .include <bsd.own.mk>
 
@@ -11,7 +12,6 @@
 SRCS+=	opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_ipsec.h
 
 CFLAGS+= -DIPFIREWALL
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
 #
 #If you want it verbose
 #CFLAGS+= -DIPFIREWALL_VERBOSE

Modified: trunk/sys/modules/ipfw_nat/Makefile
===================================================================
--- trunk/sys/modules/ipfw_nat/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipfw_nat/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipfw_nat/Makefile 240494 2012-09-14 11:51:49Z glebius $
 
 .PATH: ${.CURDIR}/../../netpfil/ipfw
 

Modified: trunk/sys/modules/ipmi/Makefile
===================================================================
--- trunk/sys/modules/ipmi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipmi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipmi/Makefile 190445 2009-03-26 17:14:22Z ambrisko $
 
 SUBDIR+= ipmi_linux
 

Modified: trunk/sys/modules/ipmi/ipmi_linux/Makefile
===================================================================
--- trunk/sys/modules/ipmi/ipmi_linux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipmi/ipmi_linux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipmi/ipmi_linux/Makefile 190452 2009-03-26 19:15:31Z ambrisko $
 
 .PATH: ${.CURDIR}/../../../dev/ipmi
 

Modified: trunk/sys/modules/ips/Makefile
===================================================================
--- trunk/sys/modules/ips/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ips/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ips/Makefile 239462 2012-08-20 18:33:03Z dim $
 
 .PATH:		${.CURDIR}/../../dev/ips
 KMOD		= ips
@@ -6,3 +7,7 @@
 			ips_ioctl.h ips_ioctl.c device_if.h bus_if.h pci_if.h 
 
 .include <bsd.kmod.mk>
+
+# XXX Work around clang warning, until maintainer approves fix.
+CWARNFLAGS.ips.c=	${NO_WSOMETIMES_UNINITIALIZED}
+CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/ipw/Makefile
===================================================================
--- trunk/sys/modules/ipw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/ipw/Makefile,v 1.2 2005/09/27 18:10:35 mlaier Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipw/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/ipw
 

Modified: trunk/sys/modules/ipwfw/Makefile
===================================================================
--- trunk/sys/modules/ipwfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipwfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipwfw/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 SUBDIR=	ipw_bss	\
 	ipw_ibss \

Modified: trunk/sys/modules/ipwfw/ipw_bss/Makefile
===================================================================
--- trunk/sys/modules/ipwfw/ipw_bss/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipwfw/ipw_bss/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipwfw/ipw_bss/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/ipw
 

Modified: trunk/sys/modules/ipwfw/ipw_ibss/Makefile
===================================================================
--- trunk/sys/modules/ipwfw/ipw_ibss/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipwfw/ipw_ibss/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipwfw/ipw_ibss/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/ipw
 

Modified: trunk/sys/modules/ipwfw/ipw_monitor/Makefile
===================================================================
--- trunk/sys/modules/ipwfw/ipw_monitor/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ipwfw/ipw_monitor/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ipwfw/ipw_monitor/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/ipw
 

Modified: trunk/sys/modules/isci/Makefile
===================================================================
--- trunk/sys/modules/isci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/isci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
+# $MidnightBSD$
 # isci driver Makefile
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/isci/Makefile 245952 2013-01-26 22:08:21Z pfg $
 
 ISCI_SRC_PATH = ${.CURDIR}/../..
 


Property changes on: trunk/sys/modules/isci/Makefile
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/sys/modules/iscsi/Makefile
===================================================================
--- trunk/sys/modules/iscsi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iscsi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,26 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iscsi/Makefile 255570 2013-09-14 15:29:06Z trasz $
 
-SUBDIR= initiator
+.PATH:	${.CURDIR}/../../dev/iscsi/
+KMOD=	iscsi
 
-.include <bsd.subdir.mk>
+SRCS=	iscsi.c
+.if defined(ICL_RDMA)
+SRCS+=	icl_rdma.c
+.else
+SRCS+=	icl.c
+.endif
+SRCS+=	icl_proxy.c
+SRCS+=	opt_cam.h
+SRCS+=	bus_if.h
+SRCS+=	device_if.h
+
+# Those below are required for RDMA.
+SRCS+=	vnode_if.h
+SRCS+=	opt_inet.h
+SRCS+=	opt_inet6.h
+
+CFLAGS+= -I${.CURDIR}/../../ofed/include
+#CFLAGS+=-DICL_KERNEL_PROXY
+
+.include <bsd.kmod.mk>

Modified: trunk/sys/modules/iscsi/initiator/Makefile
===================================================================
--- trunk/sys/modules/iscsi/initiator/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iscsi/initiator/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../dev/iscsi/initiator

Modified: trunk/sys/modules/isp/Makefile
===================================================================
--- trunk/sys/modules/isp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/isp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,15 +1,16 @@
-# $MidnightBSD: src/sys/modules/isp/Makefile,v 1.2 2010/08/31 23:34:39 laffer1 Exp $
-# $FreeBSD: src/sys/modules/isp/Makefile,v 1.2 2004/08/12 17:41:31 marius Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/isp/Makefile 331635 2018-03-27 17:48:39Z brooks $
 
 .PATH: ${.CURDIR}/../../dev/isp
 
 KMOD=	isp
 SRCS=	bus_if.h device_if.h pci_if.h \
-	opt_cam.h opt_ddb.h opt_isp.h \
+	opt_cam.h opt_compat.h opt_ddb.h opt_isp.h \
 	isp.c isp_library.c isp_target.c isp_freebsd.c isp_pci.c
 
 .if ${MACHINE} == sparc64
 SRCS+=	isp_sbus.c ofw_bus_if.h
 .endif
+CFLAGS+=	-Wformat -Wall -Werror
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/ispfw/Makefile
===================================================================
--- trunk/sys/modules/ispfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,24 +25,19 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$ 
+# $FreeBSD: stable/10/sys/modules/ispfw/Makefile 291528 2015-11-30 21:55:35Z mav $ 
 
 
 SUBDIR = ispfw
 SUBDIR += isp_1040
-SUBDIR += isp_1040_it
 SUBDIR += isp_1080
-SUBDIR += isp_1080_it
 SUBDIR += isp_12160
-SUBDIR += isp_12160_it
 SUBDIR += isp_2100
 SUBDIR += isp_2200
 SUBDIR += isp_2300
 SUBDIR += isp_2322
 SUBDIR += isp_2400
-SUBDIR += isp_2400_multi
 SUBDIR += isp_2500
-SUBDIR += isp_2500_multi
 .if ${MACHINE} == "sparc64"
 SUBDIR += isp_1000
 .endif

Modified: trunk/sys/modules/ispfw/isp_1000/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_1000/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_1000/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_1000/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_1040/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_1040/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_1040/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_1040/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_1040_it/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_1040_it/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_1040_it/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.

Modified: trunk/sys/modules/ispfw/isp_1080/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_1080/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_1080/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_1080/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_1080_it/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_1080_it/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_1080_it/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.

Modified: trunk/sys/modules/ispfw/isp_12160/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_12160/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_12160/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_12160/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_12160_it/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_12160_it/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_12160_it/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.

Modified: trunk/sys/modules/ispfw/isp_2100/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2100/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2100/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_2100/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_2200/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2200/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2200/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_2200/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_2300/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2300/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2300/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_2300/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_2322/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2322/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2322/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_2322/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_2400/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2400/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2400/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_2400/Makefile 161648 2006-08-26 18:40:25Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/ispfw/isp_2400_multi/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2400_multi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2400_multi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 #-
 # Copyright (c) 2009 by Matthew Jacob

Modified: trunk/sys/modules/ispfw/isp_2500/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2500/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2500/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/isp_2500/Makefile 196007 2009-08-01 00:57:34Z mjacob $
 #-
 # Copyright (c) 2009 by Matthew Jacob
 # All rights reserved.

Modified: trunk/sys/modules/ispfw/isp_2500_multi/Makefile
===================================================================
--- trunk/sys/modules/ispfw/isp_2500_multi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/isp_2500_multi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 #-
 # Copyright (c) 2009 by Matthew Jacob

Modified: trunk/sys/modules/ispfw/ispfw/Makefile
===================================================================
--- trunk/sys/modules/ispfw/ispfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ispfw/ispfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2006 by Matthew Jacob
 # All rights reserved.
@@ -24,7 +25,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ispfw/ispfw/Makefile 160212 2006-07-09 17:50:20Z mjacob $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 

Modified: trunk/sys/modules/iwi/Makefile
===================================================================
--- trunk/sys/modules/iwi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwi/Makefile 156600 2006-03-12 19:06:06Z damien $
 
 .PATH: ${.CURDIR}/../../dev/iwi
 

Modified: trunk/sys/modules/iwifw/Makefile
===================================================================
--- trunk/sys/modules/iwifw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwifw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/iwifw/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwifw/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 SUBDIR=	iwi_bss	\
 	iwi_ibss \

Modified: trunk/sys/modules/iwifw/iwi_bss/Makefile
===================================================================
--- trunk/sys/modules/iwifw/iwi_bss/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwifw/iwi_bss/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/iwifw/iwi_bss/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwifw/iwi_bss/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/iwi
 

Modified: trunk/sys/modules/iwifw/iwi_ibss/Makefile
===================================================================
--- trunk/sys/modules/iwifw/iwi_ibss/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwifw/iwi_ibss/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/iwifw/iwi_ibss/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwifw/iwi_ibss/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/iwi
 

Modified: trunk/sys/modules/iwifw/iwi_monitor/Makefile
===================================================================
--- trunk/sys/modules/iwifw/iwi_monitor/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwifw/iwi_monitor/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/iwifw/iwi_monitor/Makefile,v 1.1 2007/03/02 11:42:56 flz Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwifw/iwi_monitor/Makefile 167165 2007-03-02 11:42:56Z flz $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/iwi
 

Modified: trunk/sys/modules/iwn/Makefile
===================================================================
--- trunk/sys/modules/iwn/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwn/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwn/Makefile 253911 2013-08-03 08:21:35Z uqs $
 
 .PATH:  ${.CURDIR}/../../dev/iwn
 
 KMOD    = if_iwn
-SRCS    = if_iwn.c device_if.h bus_if.h pci_if.h
+SRCS    = if_iwn.c device_if.h bus_if.h pci_if.h opt_iwn.h opt_wlan.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/iwnfw/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/Makefile 254202 2013-08-11 01:09:16Z adrian $
 
-SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050
+SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050 iwn2030
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/iwnfw/Makefile.inc
===================================================================
--- trunk/sys/modules/iwnfw/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/iwnfw/Makefile.inc 208591 2010-05-27 12:54:42Z rpaulo $
 #
 # Common rules for building firmware.  Note this gets auto-included
 # by the subdir Makefile's as a consequence of included bsd.kmod.mk.


Property changes on: trunk/sys/modules/iwnfw/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/iwnfw/iwn1000/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn1000/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn1000/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn1000/Makefile 220892 2011-04-20 17:32:20Z bschmidt $
 
 KMOD=	iwn1000fw
 IMG=	iwlwifi-1000-39.31.5.1

Modified: trunk/sys/modules/iwnfw/iwn4965/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn4965/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn4965/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn4965/Makefile 201209 2009-12-29 19:47:34Z rpaulo $
 
 KMOD=	iwn4965fw
 IMG=	iwlwifi-4965-228.61.2.24

Modified: trunk/sys/modules/iwnfw/iwn5000/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn5000/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn5000/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn5000/Makefile 220892 2011-04-20 17:32:20Z bschmidt $
 
 KMOD=	iwn5000fw
 IMG=	iwlwifi-5000-8.83.5.1

Modified: trunk/sys/modules/iwnfw/iwn5150/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn5150/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn5150/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn5150/Makefile 198439 2009-10-24 09:55:11Z rpaulo $
 
 KMOD=	iwn5150fw
 IMG=	iwlwifi-5150-8.24.2.2

Modified: trunk/sys/modules/iwnfw/iwn6000/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn6000/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn6000/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn6000/Makefile 210113 2010-07-15 11:26:07Z bschmidt $
 
 KMOD=	iwn6000fw
 IMG=	iwlwifi-6000-9.221.4.1

Modified: trunk/sys/modules/iwnfw/iwn6000g2a/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn6000g2a/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn6000g2a/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn6000g2a/Makefile 254199 2013-08-11 01:03:32Z adrian $
 
 KMOD=	iwn6000g2afw
-IMG=	iwlwifi-6000g2a-17.168.5.2
+IMG=	iwlwifi-6000g2a-18.168.6.1
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/iwnfw/iwn6000g2b/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn6000g2b/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn6000g2b/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn6000g2b/Makefile 220893 2011-04-20 17:34:09Z bschmidt $
 
 KMOD=	iwn6000g2bfw
 IMG=	iwlwifi-6000g2b-17.168.5.2

Modified: trunk/sys/modules/iwnfw/iwn6050/Makefile
===================================================================
--- trunk/sys/modules/iwnfw/iwn6050/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/iwnfw/iwn6050/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/iwnfw/iwn6050/Makefile 220892 2011-04-20 17:32:20Z bschmidt $
 
 KMOD=	iwn6050fw
 IMG=	iwlwifi-6050-41.28.5.1

Modified: trunk/sys/modules/ixgb/Makefile
===================================================================
--- trunk/sys/modules/ixgb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ixgb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-#$FreeBSD$
+# $MidnightBSD$
+#$FreeBSD: stable/10/sys/modules/ixgb/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/ixgb
 

Modified: trunk/sys/modules/ixgbe/Makefile
===================================================================
--- trunk/sys/modules/ixgbe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ixgbe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,12 +1,11 @@
 # $MidnightBSD$
+#$FreeBSD: stable/10/sys/modules/ixgbe/Makefile 283668 2015-05-28 20:56:11Z erj $
 
 .PATH:  ${.CURDIR}/../../dev/ixgbe
-KMOD    = ixgbe
+
+KMOD    = if_ixgbe
 SRCS    = device_if.h bus_if.h pci_if.h
-SRCS    += ixgbe.c ixv.c
-# Shared source
-SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
-SRCS    += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
-CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
+SRCS    += ixgbe.c
+CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/jme/Makefile
===================================================================
--- trunk/sys/modules/jme/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/jme/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/jme/Makefile 179338 2008-05-27 01:54:45Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/jme
 

Modified: trunk/sys/modules/joy/Makefile
===================================================================
--- trunk/sys/modules/joy/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/joy/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/joy/Makefile 129740 2004-05-26 00:53:10Z imp $
 
 .PATH: ${.CURDIR}/../../dev/joy
 

Modified: trunk/sys/modules/kbdmux/Makefile
===================================================================
--- trunk/sys/modules/kbdmux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/kbdmux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,10 +1,11 @@
-# $Id: Makefile,v 1.3 2012-10-12 03:28:52 laffer1 Exp $
-# $FreeBSD: src/sys/modules/kbdmux/Makefile,v 1.1.2.3 2006/03/04 00:08:20 emax Exp $
+# $MidnightBSD$
+# $Id: Makefile,v 1.1 2005/06/23 00:30:50 max Exp $
+# $FreeBSD: stable/10/sys/modules/kbdmux/Makefile 298430 2016-04-21 19:25:33Z emaste $
 
 .PATH: ${.CURDIR}/../../dev/kbdmux
 
 KMOD=	kbdmux
-SRCS=	kbdmux.c opt_compat.h opt_kbd.h bus_if.h device_if.h
+SRCS=	kbdmux.c opt_compat.h opt_kbd.h opt_kbdmux.h bus_if.h device_if.h
 
 .if !defined(KERNBUILDDIR)
 opt_compat.h:

Modified: trunk/sys/modules/kgssapi/Makefile
===================================================================
--- trunk/sys/modules/kgssapi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/kgssapi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/kgssapi/Makefile 231118 2012-02-07 09:27:07Z dim $
 
 .PATH: ${.CURDIR}/../../kgssapi ${.CURDIR}/../../rpc/rpcsec_gss
 KMOD=	kgssapi

Modified: trunk/sys/modules/kgssapi_krb5/Makefile
===================================================================
--- trunk/sys/modules/kgssapi_krb5/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/kgssapi_krb5/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/kgssapi_krb5/Makefile 231118 2012-02-07 09:27:07Z dim $
 
 .PATH: ${.CURDIR}/../../kgssapi/krb5
 KMOD=	kgssapi_krb5

Modified: trunk/sys/modules/khelp/Makefile
===================================================================
--- trunk/sys/modules/khelp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/khelp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/khelp/Makefile 217806 2011-01-24 23:08:38Z lstewart $
 
 SUBDIR=	h_ertt
 

Modified: trunk/sys/modules/khelp/h_ertt/Makefile
===================================================================
--- trunk/sys/modules/khelp/h_ertt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/khelp/h_ertt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/khelp/h_ertt/Makefile 217806 2011-01-24 23:08:38Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/krpc/Makefile
===================================================================
--- trunk/sys/modules/krpc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/krpc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $MidnightBSD: src/sys/modules/krpc/Makefile,v 1.1 2012/03/24 21:30:06 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/krpc/Makefile 269398 2014-08-01 21:10:41Z rmacklem $
 
 .PATH: ${.CURDIR}/../../rpc ${.CURDIR}/../../xdr
 KMOD=	krpc
@@ -5,6 +6,7 @@
 SRCS=	auth_none.c \
 	auth_unix.c \
 	authunix_prot.c \
+	clnt_bck.c \
 	clnt_dg.c \
 	clnt_rc.c \
 	clnt_vc.c \

Modified: trunk/sys/modules/ksyms/Makefile
===================================================================
--- trunk/sys/modules/ksyms/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ksyms/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ksyms/Makefile 192859 2009-05-26 21:39:09Z sson $
 
 .PATH: ${.CURDIR}/../../dev/ksyms
 

Modified: trunk/sys/modules/le/Makefile
===================================================================
--- trunk/sys/modules/le/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/le/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/le/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../dev/le
 

Modified: trunk/sys/modules/lge/Makefile
===================================================================
--- trunk/sys/modules/lge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/lge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/lge/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/lge
 

Modified: trunk/sys/modules/libalias/Makefile
===================================================================
--- trunk/sys/modules/libalias/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/Makefile 162701 2006-09-27 12:30:27Z ru $
 
 SUBDIR=	libalias modules
 

Modified: trunk/sys/modules/libalias/libalias/Makefile
===================================================================
--- trunk/sys/modules/libalias/libalias/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/libalias/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/libalias/Makefile 188294 2009-02-07 18:49:42Z piso $
 
 .PATH: ${.CURDIR}/../../../netinet/libalias
 

Modified: trunk/sys/modules/libalias/modules/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/Makefile 162701 2006-09-27 12:30:27Z ru $
 
 .include "${.CURDIR}/modules.inc"
 

Modified: trunk/sys/modules/libalias/modules/Makefile.inc
===================================================================
--- trunk/sys/modules/libalias/modules/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/libalias/modules/Makefile.inc 162674 2006-09-26 23:26:53Z piso $
 
 .PATH: ${.CURDIR}/../../../../netinet/libalias


Property changes on: trunk/sys/modules/libalias/modules/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/libalias/modules/cuseeme/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/cuseeme/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/cuseeme/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/cuseeme/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_cuseeme
 SRCS=	alias_cuseeme.c

Modified: trunk/sys/modules/libalias/modules/dummy/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/dummy/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/dummy/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/dummy/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_dummy
 SRCS=	alias_dummy.c

Modified: trunk/sys/modules/libalias/modules/ftp/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/ftp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/ftp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/ftp/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_ftp
 SRCS=	alias_ftp.c

Modified: trunk/sys/modules/libalias/modules/irc/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/irc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/irc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/irc/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_irc
 SRCS=	alias_irc.c

Modified: trunk/sys/modules/libalias/modules/modules.inc
===================================================================
--- trunk/sys/modules/libalias/modules/modules.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/modules.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/libalias/modules/modules.inc 162674 2006-09-26 23:26:53Z piso $
 
 MODULES		 =
 MODULES		+= cuseeme


Property changes on: trunk/sys/modules/libalias/modules/modules.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/libalias/modules/nbt/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/nbt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/nbt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/nbt/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_nbt
 SRCS=	alias_nbt.c

Modified: trunk/sys/modules/libalias/modules/pptp/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/pptp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/pptp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/pptp/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_pptp
 SRCS=	alias_pptp.c

Modified: trunk/sys/modules/libalias/modules/skinny/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/skinny/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/skinny/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/skinny/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_skinny
 SRCS=	alias_skinny.c

Modified: trunk/sys/modules/libalias/modules/smedia/Makefile
===================================================================
--- trunk/sys/modules/libalias/modules/smedia/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libalias/modules/smedia/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libalias/modules/smedia/Makefile 162674 2006-09-26 23:26:53Z piso $
 
 KMOD=	alias_smedia
 SRCS=	alias_smedia.c

Modified: trunk/sys/modules/libiconv/Makefile
===================================================================
--- trunk/sys/modules/libiconv/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libiconv/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libiconv/Makefile 227650 2011-11-18 03:05:20Z kevlo $
 
 .PATH: ${.CURDIR}/../../libkern ${.CURDIR}/../../sys
 
 KMOD=	libiconv
-SRCS=	iconv.c iconv_ucs.c  iconv_xlat.c iconv_xlat16.c
+SRCS=	iconv.c iconv_ucs.c iconv_xlat.c iconv_xlat16.c
 SRCS+=	iconv.h 
 SRCS+=	iconv_converter_if.c iconv_converter_if.h
 MFILES=	libkern/iconv_converter_if.m

Modified: trunk/sys/modules/libmbpool/Makefile
===================================================================
--- trunk/sys/modules/libmbpool/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libmbpool/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libmbpool/Makefile 117624 2003-07-15 08:59:38Z harti $
 
 .PATH: ${.CURDIR}/../../kern
 

Modified: trunk/sys/modules/libmchain/Makefile
===================================================================
--- trunk/sys/modules/libmchain/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/libmchain/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/libmchain/Makefile 227650 2011-11-18 03:05:20Z kevlo $
 
 .PATH: ${.CURDIR}/../../kern
 

Modified: trunk/sys/modules/linprocfs/Makefile
===================================================================
--- trunk/sys/modules/linprocfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/linprocfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/linprocfs/Makefile 293527 2016-01-09 16:08:22Z dchagin $
 
 .PATH: ${.CURDIR}/../../compat/linprocfs
 
@@ -5,11 +6,6 @@
 KMOD=	linprocfs
 SRCS=	vnode_if.h \
 	device_if.h bus_if.h \
-	linprocfs.c \
-	opt_compat.h
+	linprocfs.c
 
-.if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=-DCOMPAT_LINUX32
-.endif
-
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/linsysfs/Makefile
===================================================================
--- trunk/sys/modules/linsysfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/linsysfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/linsysfs/Makefile 293527 2016-01-09 16:08:22Z dchagin $
 
 .PATH: ${.CURDIR}/../../compat/linsysfs
 
@@ -5,11 +6,6 @@
 KMOD=	linsysfs
 SRCS=	vnode_if.h \
 	device_if.h bus_if.h  pci_if.h \
-	linsysfs.c \
-	opt_compat.h
+	linsysfs.c
 
-.if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=-DCOMPAT_LINUX32
-.endif
-
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/linux/Makefile
===================================================================
--- trunk/sys/modules/linux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/linux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/linux/Makefile,v 1.72 2007/05/23 15:45:52 kib Exp $
+# $FreeBSD: stable/10/sys/modules/linux/Makefile 302964 2016-07-17 15:23:32Z dchagin $
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SFX= 32
@@ -8,14 +8,19 @@
 
 .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}
 
+VDSO=	linux${SFX}_vdso
+
 KMOD=	linux
-SRCS=	linux_fork.c linux${SFX}_dummy.c linux_emul.c linux_file.c \
+SRCS=	linux_fork.c linux${SFX}_dummy.c linux_file.c linux_event.c \
 	linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
-	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
+	linux${SFX}_machdep.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
-	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
+	linux${SFX}_sysvec.c linux_uid16.c linux_time.c \
+	linux_timer.c linux_vdso.c \
 	opt_inet6.h opt_compat.h opt_kdtrace.h opt_posix.h opt_usb.h \
-	vnode_if.h device_if.h bus_if.h assym.s
+	vnode_if.h device_if.h bus_if.h assym.s \
+	linux${SFX}_support.s
+DPSRCS=	linux${SFX}_genassym.c
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
@@ -23,37 +28,50 @@
 SRCS+=	opt_apic.h
 .endif
 
-OBJS=	linux${SFX}_locore.o linux${SFX}_support.o
+OBJS=	${VDSO}.so
 
 .if ${MACHINE_CPUARCH} == "i386"
-SRCS+=	linux_ptrace.c imgact_linux.c opt_cpu.h
+SRCS+=	linux_ptrace.c imgact_linux.c linux_util.c linux_mib.c linux_mmap.c \
+	linux_emul.c opt_cpu.h linux.c
 .endif
 
+.if ${MACHINE_CPUARCH} == "i386"
 EXPORT_SYMS=
 EXPORT_SYMS+=	linux_emul_path
 EXPORT_SYMS+=	linux_get_osname
 EXPORT_SYMS+=	linux_get_osrelease
-EXPORT_SYMS+=	linux_ifname
 EXPORT_SYMS+=	linux_ioctl_register_handler
 EXPORT_SYMS+=	linux_ioctl_unregister_handler
+.endif
 
-CLEANFILES=	linux${SFX}_assym.h linux${SFX}_genassym.o
+CLEANFILES=	linux${SFX}_assym.h linux${SFX}_genassym.o linux${SFX}_locore.o
 
 linux${SFX}_assym.h: linux${SFX}_genassym.o
-.if exists(@)
-linux${SFX}_assym.h: @/kern/genassym.sh
-.endif
-	sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
+	sh ${SYSDIR}/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
 
-linux${SFX}_locore.o: linux${SFX}_locore.s linux${SFX}_assym.h
-	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
+linux${SFX}_locore.o: linux${SFX}_assym.h assym.s
+	${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s			\
+	-pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc -nostdlib	\
+	-fno-omit-frame-pointer							\
+	-Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s	\
+	-Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-fPIC,-warn-common		\
 	    ${.IMPSRC} -o ${.TARGET}
 
-linux${SFX}_support.o: linux${SFX}_support.s assym.s linux${SFX}_assym.h
+linux${SFX}_support.o: linux${SFX}_assym.h assym.s
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
-linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine
+.if ${MACHINE_CPUARCH} == "amd64"
+${VDSO}.so: linux${SFX}_locore.o
+	${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd			\
+	    --binary-architecture i386 linux${SFX}_locore.o ${.TARGET}
+.else
+${VDSO}.so: linux${SFX}_locore.o
+	${OBJCOPY} --input-target binary --output-target elf32-i386-freebsd			\
+	    --binary-architecture i386 linux${SFX}_locore.o ${.TARGET}
+.endif
+
+linux${SFX}_genassym.o:
 	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
@@ -62,10 +80,9 @@
 .if defined(KTR)
 CFLAGS+=	-DKTR
 .endif
+.if defined(DEBUG)
+CFLAGS+=	-DDEBUG
 .endif
+.endif
 
 .include <bsd.kmod.mk>
-
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS.linux32_locore.s=	${CLANG_NO_IAS}
-CFLAGS+=			${CFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/lmc/Makefile
===================================================================
--- trunk/sys/modules/lmc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/lmc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/lmc/Makefile 150967 2005-10-05 10:07:27Z glebius $
 
 KMOD  = if_lmc
 .PATH: ${.CURDIR}/../../dev/lmc

Modified: trunk/sys/modules/lpt/Makefile
===================================================================
--- trunk/sys/modules/lpt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/lpt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/lpt/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	lpt

Modified: trunk/sys/modules/mac_biba/Makefile
===================================================================
--- trunk/sys/modules/mac_biba/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_biba/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_biba/Makefile 105725 2002-10-22 17:10:15Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_biba
 

Modified: trunk/sys/modules/mac_bsdextended/Makefile
===================================================================
--- trunk/sys/modules/mac_bsdextended/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_bsdextended/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_bsdextended/Makefile 184331 2008-10-27 12:09:15Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_bsdextended
 

Modified: trunk/sys/modules/mac_ifoff/Makefile
===================================================================
--- trunk/sys/modules/mac_ifoff/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_ifoff/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_ifoff/Makefile 105725 2002-10-22 17:10:15Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_ifoff
 

Modified: trunk/sys/modules/mac_lomac/Makefile
===================================================================
--- trunk/sys/modules/mac_lomac/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_lomac/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_lomac/Makefile 193588 2009-06-06 17:01:44Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_lomac
 

Modified: trunk/sys/modules/mac_mls/Makefile
===================================================================
--- trunk/sys/modules/mac_mls/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_mls/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_mls/Makefile 105725 2002-10-22 17:10:15Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_mls
 

Modified: trunk/sys/modules/mac_none/Makefile
===================================================================
--- trunk/sys/modules/mac_none/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_none/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_none/Makefile 105725 2002-10-22 17:10:15Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_none
 

Modified: trunk/sys/modules/mac_partition/Makefile
===================================================================
--- trunk/sys/modules/mac_partition/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_partition/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_partition/Makefile 105841 2002-10-24 02:04:03Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_partition
 

Modified: trunk/sys/modules/mac_portacl/Makefile
===================================================================
--- trunk/sys/modules/mac_portacl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_portacl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_portacl/Makefile 139435 2004-12-30 13:49:01Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_portacl
 

Modified: trunk/sys/modules/mac_seeotheruids/Makefile
===================================================================
--- trunk/sys/modules/mac_seeotheruids/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_seeotheruids/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_seeotheruids/Makefile 101172 2002-08-01 17:41:27Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_seeotheruids
 

Modified: trunk/sys/modules/mac_stub/Makefile
===================================================================
--- trunk/sys/modules/mac_stub/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_stub/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_stub/Makefile 122512 2003-11-11 21:23:54Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_stub
 

Modified: trunk/sys/modules/mac_test/Makefile
===================================================================
--- trunk/sys/modules/mac_test/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mac_test/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mac_test/Makefile 105725 2002-10-22 17:10:15Z rwatson $
 
 .PATH: ${.CURDIR}/../../security/mac_test
 

Modified: trunk/sys/modules/malo/Makefile
===================================================================
--- trunk/sys/modules/malo/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/malo/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/malo/Makefile 178354 2008-04-20 20:35:46Z sam $
 
 .PATH: ${.CURDIR}/../../dev/malo
 

Modified: trunk/sys/modules/mcd/Makefile
===================================================================
--- trunk/sys/modules/mcd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mcd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mcd/Makefile 112806 2003-03-29 16:13:11Z mdodd $
 
 .PATH: ${.CURDIR}/../../dev/mcd
 

Modified: trunk/sys/modules/md/Makefile
===================================================================
--- trunk/sys/modules/md/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/md/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/md/Makefile 152309 2005-11-11 11:31:23Z pjd $
 
 .PATH: ${.CURDIR}/../../dev/md
 

Modified: trunk/sys/modules/mem/Makefile
===================================================================
--- trunk/sys/modules/mem/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mem/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mem/Makefile 221869 2011-05-14 01:53:38Z attilio $
 
 .PATH: ${.CURDIR}/../../dev/mem
 .PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE}

Modified: trunk/sys/modules/mfi/Makefile
===================================================================
--- trunk/sys/modules/mfi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mfi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $MidnightBSD: src/sys/modules/mfi/Makefile,v 1.1 2007/03/08 18:03:15 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mfi/Makefile 233711 2012-03-30 23:05:48Z ambrisko $
 
 .PATH: ${.CURDIR}/../../dev/mfi
 

Modified: trunk/sys/modules/mfi/mfi_linux/Makefile
===================================================================
--- trunk/sys/modules/mfi/mfi_linux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mfi/mfi_linux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mfi/mfi_linux/Makefile 158737 2006-05-18 23:30:48Z ambrisko $
 
 .PATH: ${.CURDIR}/../../../dev/mfi
 

Modified: trunk/sys/modules/mfi/mfip/Makefile
===================================================================
--- trunk/sys/modules/mfi/mfip/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mfi/mfip/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mfi/mfip/Makefile 169609 2007-05-16 17:19:47Z scottl $
 
 .PATH: ${.CURDIR}/../../../dev/mfi
 

Modified: trunk/sys/modules/mii/Makefile
===================================================================
--- trunk/sys/modules/mii/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mii/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mii/Makefile 239275 2012-08-15 04:03:55Z gonzo $
 
 .PATH: ${.CURDIR}/../../dev/mii
 
@@ -8,7 +9,8 @@
 SRCS+=	e1000phy.c gentbi.c icsphy.c ip1000phy.c jmphy.c lxtphy.c
 SRCS+=	miibus_if.c miibus_if.h mii.c miidevs.h mii_bitbang.c mii_physubr.c
 SRCS+=	mlphy.c nsgphy.c nsphy.c nsphyter.c pci_if.h pnaphy.c qsphy.c
-SRCS+=	rdcphy.c rgephy.c rlphy.c smcphy.c tdkphy.c tlphy.c truephy.c
+SRCS+=	rdcphy.c rgephy.c rlphy.c smcphy.c
+SRCS+=	smscphy.c tdkphy.c tlphy.c truephy.c
 SRCS+=	ukphy.c ukphy_subr.c
 SRCS+=	xmphy.c
 

Modified: trunk/sys/modules/mlx/Makefile
===================================================================
--- trunk/sys/modules/mlx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mlx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mlx/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH: ${.CURDIR}/../../dev/mlx
 

Modified: trunk/sys/modules/mlx4/Makefile
===================================================================
--- trunk/sys/modules/mlx4/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mlx4/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,13 +1,14 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mlx4/Makefile 272407 2014-10-02 10:46:12Z hselasky $
 .PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
 
 .include <bsd.own.mk>
 
+.PATH:  ${.CURDIR}/../../ofed/include/linux
 KMOD    = mlx4
-SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
-SRCS+=	alloc.c catas.c cmd.c cq.c eq.c fw.c icm.c intf.c main.c mcg.c mr.c
-SRCS+=	pd.c port.c profile.c qp.c reset.c sense.c srq.c xrcd.c
-SRCS+=	opt_inet.h opt_inet6.h
+SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h opt_inet.h opt_inet6.h
+SRCS+= alloc.c catas.c cmd.c cq.c eq.c fw.c icm.c intf.c main.c mcg.c mr.c linux_compat.c linux_radix.c	linux_idr.c
+SRCS+=	pd.c port.c profile.c qp.c reset.c sense.c srq.c resource_tracker.c sys_tune.c
 
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
@@ -26,4 +27,8 @@
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
+CFLAGS+= -fms-extensions
+
+CWARNFLAGS.mcg.c=	-Wno-unused
+CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/mlx4ib/Makefile
===================================================================
--- trunk/sys/modules/mlx4ib/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mlx4ib/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,14 +1,23 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mlx4ib/Makefile 271127 2014-09-04 20:12:36Z hselasky $
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
+.PATH:  ${.CURDIR}/../../ofed/include/linux
 
 .include <bsd.own.mk>
 
 KMOD    = mlx4ib
 SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
-SRCS+=	ah.c cq.c doorbell.c mad.c main.c mr.c qp.c srq.c wc.c
+SRCS+= linux_compat.c linux_radix.c linux_idr.c 
+SRCS+=	alias_GUID.c mcg.c sysfs.c ah.c cq.c doorbell.c mad.c main.c mr.c qp.c srq.c wc.c cm.c
 SRCS+=	opt_inet.h opt_inet6.h
 
+#CFLAGS+= -I${.CURDIR}/../../ofed/include/
+#CFLAGS+= -I${.CURDIR}/../../../../include
+CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
+CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
+CFLAGS+= -DINET6 -DINET -DOFED
+CFLAGS+= -fms-extensions
 
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET_SUPPORT} != "no"
@@ -24,4 +33,4 @@
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}

Modified: trunk/sys/modules/mlxen/Makefile
===================================================================
--- trunk/sys/modules/mlxen/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mlxen/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mlxen/Makefile 292107 2015-12-11 14:21:58Z hselasky $
 .PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
 
 .include <bsd.own.mk>
@@ -5,11 +6,12 @@
 
 KMOD    = mlxen
 SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
-SRCS	+= en_cq.c en_frag.c en_main.c en_netdev.c en_port.c en_resources.c
-SRCS	+= en_rx.c en_tx.c
+SRCS	+= en_cq.c en_main.c en_netdev.c en_port.c en_resources.c
+SRCS	+= en_rx.c en_tx.c utils.c
 SRCS	+= opt_inet.h opt_inet6.h
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
+CFLAGS+= -fms-extensions
 
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET_SUPPORT} != "no"
@@ -25,4 +27,4 @@
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= ${GCC_MS_EXTENSIONS}

Modified: trunk/sys/modules/mly/Makefile
===================================================================
--- trunk/sys/modules/mly/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mly/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mly/Makefile 79695 2001-07-14 00:12:23Z msmith $
 
 .PATH: ${.CURDIR}/../../dev/mly
 

Modified: trunk/sys/modules/mmc/Makefile
===================================================================
--- trunk/sys/modules/mmc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mmc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mmc/Makefile 318198 2017-05-11 21:01:02Z marius $
 
 .PATH: ${.CURDIR}/../../dev/mmc
 
 KMOD=	mmc
-SRCS=	mmc.c mmcbr_if.h mmcbus_if.h device_if.h bus_if.h
+SRCS=	bus_if.h device_if.h mmc_subr.c mmc.c mmcbr_if.h mmcbus_if.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/mmcsd/Makefile
===================================================================
--- trunk/sys/modules/mmcsd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mmcsd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mmcsd/Makefile 234524 2012-04-21 01:51:16Z marius $
 
 .PATH: ${.CURDIR}/../../dev/mmc
 

Modified: trunk/sys/modules/mps/Makefile
===================================================================
--- trunk/sys/modules/mps/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mps/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mps/Makefile 239462 2012-08-20 18:33:03Z dim $
 
 .PATH: ${.CURDIR}/../../dev/mps
 
@@ -9,9 +10,10 @@
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DMPS_DEBUG
-DEBUG_FLAGS += -g
 
 .include <bsd.kmod.mk>
 
-CWARNFLAGS.mps_sas.c=	${NO_WUNNEEDED_INTERNAL_DECL}
-CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
+CWARNFLAGS.mps_sas.c=		${NO_WUNNEEDED_INTERNAL_DECL}
+# XXX Work around clang warning, until maintainer approves fix.
+CWARNFLAGS.mps_mapping.c=	${NO_WSOMETIMES_UNINITIALIZED}
+CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/mpt/Makefile
===================================================================
--- trunk/sys/modules/mpt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mpt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mpt/Makefile 178814 2008-05-06 20:49:53Z jhb $
 
 .PATH: ${.CURDIR}/../../dev/mpt
 

Modified: trunk/sys/modules/mqueue/Makefile
===================================================================
--- trunk/sys/modules/mqueue/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mqueue/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mqueue/Makefile 247719 2013-03-03 16:17:09Z uqs $
 
 .PATH: ${.CURDIR}/../../kern
 
@@ -5,6 +6,6 @@
 KMOD=	mqueuefs
 SRCS=	uipc_mqueue.c \
 	vnode_if.h \
-	opt_posix.h opt_compat.h
+	opt_posix.h opt_compat.h opt_capsicum.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/msdosfs/Makefile
===================================================================
--- trunk/sys/modules/msdosfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/msdosfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/msdosfs/Makefile 166383 2007-02-01 04:21:03Z avatar $
 
 .PATH: ${.CURDIR}/../../fs/msdosfs
 

Modified: trunk/sys/modules/msdosfs_iconv/Makefile
===================================================================
--- trunk/sys/modules/msdosfs_iconv/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/msdosfs_iconv/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/msdosfs_iconv/Makefile 120492 2003-09-26 20:26:25Z fjoe $
 
 .PATH:	${.CURDIR}/../../fs/msdosfs
 KMOD=	msdosfs_iconv

Modified: trunk/sys/modules/mse/Makefile
===================================================================
--- trunk/sys/modules/mse/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mse/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mse/Makefile 138755 2004-12-12 20:05:50Z imp $
 
 .PATH: ${.CURDIR}/../../dev/mse
 

Modified: trunk/sys/modules/msk/Makefile
===================================================================
--- trunk/sys/modules/msk/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/msk/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/modules/msk/Makefile,v 1.1.2.1 2008/07/01 00:36:30 laffer1 Exp $
-# $FreeBSD: src/sys/modules/msk/Makefile,v 1.1.2.1 2007/03/27 02:20:20 yongari Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/msk/Makefile 165140 2006-12-13 02:37:48Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/msk
 

Modified: trunk/sys/modules/mthca/Makefile
===================================================================
--- trunk/sys/modules/mthca/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mthca/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mthca/Makefile 260495 2014-01-09 22:40:51Z dim $
 
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca
 
@@ -28,4 +29,4 @@
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}

Modified: trunk/sys/modules/mvs/Makefile
===================================================================
--- trunk/sys/modules/mvs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mvs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mvs/Makefile 208183 2010-05-17 03:51:57Z mav $
 
 .PATH: ${.CURDIR}/../../dev/mvs
 

Modified: trunk/sys/modules/mwl/Makefile
===================================================================
--- trunk/sys/modules/mwl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mwl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #
 # Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
 # All rights reserved.
@@ -26,7 +27,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/mwl/Makefile 234866 2012-05-01 07:38:40Z uqs $
 #
 
 .PATH: ${.CURDIR}/../../dev/mwl
@@ -33,7 +34,7 @@
 
 KMOD=	if_mwl
 SRCS=	if_mwl.c if_mwl_pci.c mwlhal.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_mwl.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_mwl.h opt_wlan.h
 
 opt_mwl.h:
 	echo '#define MWL_DEBUG 1'> $@

Modified: trunk/sys/modules/mwlfw/Makefile
===================================================================
--- trunk/sys/modules/mwlfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mwlfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mwlfw/Makefile 193240 2009-06-01 18:07:01Z sam $
 
 KMOD=	mw88W8363fw
 FIRMWS=	mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot

Modified: trunk/sys/modules/mxge/Makefile
===================================================================
--- trunk/sys/modules/mxge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mxge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mxge/Makefile 175365 2008-01-15 20:34:49Z gallatin $
 
 SUBDIR= mxge
 SUBDIR+=mxge_eth_z8e

Modified: trunk/sys/modules/mxge/mxge/Makefile
===================================================================
--- trunk/sys/modules/mxge/mxge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mxge/mxge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-#$FreeBSD$
+# $MidnightBSD$
+#$FreeBSD: stable/10/sys/modules/mxge/mxge/Makefile 247133 2013-02-21 21:28:33Z gallatin $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 

Modified: trunk/sys/modules/mxge/mxge_eth_z8e/Makefile
===================================================================
--- trunk/sys/modules/mxge/mxge_eth_z8e/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mxge/mxge_eth_z8e/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mxge/mxge_eth_z8e/Makefile 171500 2007-07-19 16:16:00Z gallatin $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_eth_z8e

Modified: trunk/sys/modules/mxge/mxge_ethp_z8e/Makefile
===================================================================
--- trunk/sys/modules/mxge/mxge_ethp_z8e/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mxge/mxge_ethp_z8e/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mxge/mxge_ethp_z8e/Makefile 171500 2007-07-19 16:16:00Z gallatin $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_ethp_z8e

Modified: trunk/sys/modules/mxge/mxge_rss_eth_z8e/Makefile
===================================================================
--- trunk/sys/modules/mxge/mxge_rss_eth_z8e/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mxge/mxge_rss_eth_z8e/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mxge/mxge_rss_eth_z8e/Makefile 175365 2008-01-15 20:34:49Z gallatin $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_rss_eth_z8e

Modified: trunk/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile
===================================================================
--- trunk/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile 175365 2008-01-15 20:34:49Z gallatin $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_rss_ethp_z8e

Modified: trunk/sys/modules/my/Makefile
===================================================================
--- trunk/sys/modules/my/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/my/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/my/Makefile 167453 2007-03-11 15:20:04Z brueffer $
 
 .PATH: ${.CURDIR}/../../dev/my
 

Modified: trunk/sys/modules/ncp/Makefile
===================================================================
--- trunk/sys/modules/ncp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ncp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../netncp

Modified: trunk/sys/modules/ncv/Makefile
===================================================================
--- trunk/sys/modules/ncv/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ncv/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/ncv/Makefile,v 1.3 2005/09/27 18:10:36 mlaier Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ncv/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/ncv
 

Modified: trunk/sys/modules/ndis/Makefile
===================================================================
--- trunk/sys/modules/ndis/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ndis/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/ndis/Makefile,v 1.11 2005/09/27 18:10:36 mlaier Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ndis/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../compat/ndis
 

Modified: trunk/sys/modules/netgraph/Makefile
===================================================================
--- trunk/sys/modules/netgraph/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/Makefile 291811 2015-12-04 18:44:12Z bdrewery $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/netgraph/Makefile.inc
===================================================================
--- trunk/sys/modules/netgraph/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/netgraph/Makefile.inc 146259 2005-05-16 08:25:55Z glebius $
 # $Whistle: Makefile.inc,v 1.4 1999/01/19 23:46:16 archie Exp $
 
 .PATH:		${.CURDIR}/../../../netgraph


Property changes on: trunk/sys/modules/netgraph/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/netgraph/UI/Makefile
===================================================================
--- trunk/sys/modules/netgraph/UI/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/UI/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/UI/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_UI

Modified: trunk/sys/modules/netgraph/async/Makefile
===================================================================
--- trunk/sys/modules/netgraph/async/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/async/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/async/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_async

Modified: trunk/sys/modules/netgraph/atm/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/Makefile 179308 2008-05-25 22:11:40Z rwatson $
 
 SUBDIR=			\
 	atm 		\

Modified: trunk/sys/modules/netgraph/atm/Makefile.inc
===================================================================
--- trunk/sys/modules/netgraph/atm/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/Makefile.inc 116808 2003-06-25 13:20:19Z harti $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/netgraph/atm/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/netgraph/atm/atm/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atm/atm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/atm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/atm/Makefile 193744 2009-06-08 19:57:35Z bz $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/netgraph/atm/atmbase/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atm/atmbase/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/atmbase/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/atmbase/Makefile 121938 2003-11-03 09:18:52Z harti $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/netgraph/atm/ccatm/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atm/ccatm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/ccatm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/ccatm/Makefile 220712 2011-04-16 11:15:57Z brucec $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/netgraph/atm/sscfu/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atm/sscfu/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/sscfu/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/sscfu/Makefile 121462 2003-10-24 07:42:08Z harti $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/netgraph/atm/sscop/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atm/sscop/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/sscop/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/sscop/Makefile 121462 2003-10-24 07:42:08Z harti $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 

Modified: trunk/sys/modules/netgraph/atm/uni/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atm/uni/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atm/uni/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atm/uni/Makefile 122219 2003-11-07 09:15:14Z harti $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/netgraph/atmllc/Makefile
===================================================================
--- trunk/sys/modules/netgraph/atmllc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/atmllc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/atmllc/Makefile 126742 2004-03-08 10:54:35Z benno $
 
 KMOD=	ng_atmllc
 SRCS= 	ng_atmllc.c

Modified: trunk/sys/modules/netgraph/bluetooth/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.4 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.2 2003/04/27 00:22:11 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/Makefile 181233 2008-08-03 10:32:17Z ed $
 
 SUBDIR=	\
 	bluetooth \

Modified: trunk/sys/modules/netgraph/bluetooth/Makefile.inc
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/Makefile.inc 107457 2002-12-01 16:07:53Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/netgraph/bluetooth/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/netgraph/bluetooth/bluetooth/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/bluetooth/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/bluetooth/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.4 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.1 2002/11/24 20:39:57 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/bluetooth/Makefile 155824 2006-02-18 23:49:28Z yar $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/common
 

Modified: trunk/sys/modules/netgraph/bluetooth/bt3c/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/bt3c/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/bt3c/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.4 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.2 2002/11/24 20:50:56 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/bt3c/Makefile 155824 2006-02-18 23:49:28Z yar $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
 

Modified: trunk/sys/modules/netgraph/bluetooth/h4/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/h4/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/h4/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.4 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.1 2002/11/24 20:40:04 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/h4/Makefile 155824 2006-02-18 23:49:28Z yar $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4
 

Modified: trunk/sys/modules/netgraph/bluetooth/hci/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/hci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/hci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.3 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.1 2002/11/24 20:40:05 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/hci/Makefile 124472 2004-01-13 11:28:51Z ru $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/hci
 

Modified: trunk/sys/modules/netgraph/bluetooth/l2cap/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/l2cap/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/l2cap/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.3 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.1 2002/11/24 20:40:11 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/l2cap/Makefile 124472 2004-01-13 11:28:51Z ru $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/l2cap
 

Modified: trunk/sys/modules/netgraph/bluetooth/socket/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/socket/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/socket/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.3 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.2 2003/01/12 23:37:31 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/socket/Makefile 181034 2008-07-30 22:42:17Z emax $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/socket
 

Modified: trunk/sys/modules/netgraph/bluetooth/ubt/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/ubt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/ubt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.4 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/ubt/Makefile 192909 2009-05-27 16:43:40Z thompsa $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 

Modified: trunk/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.4 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $
+# $FreeBSD: stable/10/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile 192909 2009-05-27 16:43:40Z thompsa $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 

Modified: trunk/sys/modules/netgraph/bpf/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bpf/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bpf/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/bpf/Makefile 153213 2005-12-07 21:30:47Z jkim $
 # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
 
 .PATH: ${.CURDIR}/../../../net

Modified: trunk/sys/modules/netgraph/bridge/Makefile
===================================================================
--- trunk/sys/modules/netgraph/bridge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/bridge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/bridge/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 KMOD=	ng_bridge
 SRCS= 	ng_bridge.c

Modified: trunk/sys/modules/netgraph/car/Makefile
===================================================================
--- trunk/sys/modules/netgraph/car/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/car/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/car/Makefile 169580 2007-05-15 16:24:50Z mav $
 
 KMOD=	ng_car
 SRCS= 	ng_car.c

Modified: trunk/sys/modules/netgraph/cisco/Makefile
===================================================================
--- trunk/sys/modules/netgraph/cisco/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/cisco/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/cisco/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_cisco

Modified: trunk/sys/modules/netgraph/deflate/Makefile
===================================================================
--- trunk/sys/modules/netgraph/deflate/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/deflate/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/deflate/Makefile 165629 2006-12-29 13:16:43Z glebius $
 
 KMOD=		ng_deflate
 SRCS= 		ng_deflate.c

Modified: trunk/sys/modules/netgraph/device/Makefile
===================================================================
--- trunk/sys/modules/netgraph/device/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/device/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/device/Makefile 136673 2004-10-18 20:13:57Z glebius $
 KMOD=   ng_device
 SRCS=   ng_device.c
 

Modified: trunk/sys/modules/netgraph/echo/Makefile
===================================================================
--- trunk/sys/modules/netgraph/echo/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/echo/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/echo/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_echo

Modified: trunk/sys/modules/netgraph/eiface/Makefile
===================================================================
--- trunk/sys/modules/netgraph/eiface/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/eiface/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/eiface/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 KMOD=	ng_eiface
 SRCS= 	ng_eiface.c

Modified: trunk/sys/modules/netgraph/etf/Makefile
===================================================================
--- trunk/sys/modules/netgraph/etf/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/etf/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/etf/Makefile 122414 2003-11-10 12:54:54Z ru $
 # Ethertype filter
 
 KMOD=	ng_etf

Modified: trunk/sys/modules/netgraph/ether/Makefile
===================================================================
--- trunk/sys/modules/netgraph/ether/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/ether/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/ether/Makefile 193744 2009-06-08 19:57:35Z bz $
 
 KMOD=	ng_ether
 SRCS= 	ng_ether.c

Modified: trunk/sys/modules/netgraph/ether_echo/Makefile
===================================================================
--- trunk/sys/modules/netgraph/ether_echo/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/ether_echo/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/ether_echo/Makefile 186481 2008-12-25 00:01:29Z julian $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_ether_echo

Modified: trunk/sys/modules/netgraph/fec/Makefile
===================================================================
--- trunk/sys/modules/netgraph/fec/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/fec/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/fec/Makefile 124473 2004-01-13 11:30:37Z ru $
 
 KMOD=		ng_fec
 SRCS= 		ng_fec.c opt_inet.h opt_inet6.h

Modified: trunk/sys/modules/netgraph/frame_relay/Makefile
===================================================================
--- trunk/sys/modules/netgraph/frame_relay/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/frame_relay/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/frame_relay/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_frame_relay

Modified: trunk/sys/modules/netgraph/gif/Makefile
===================================================================
--- trunk/sys/modules/netgraph/gif/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/gif/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/gif/Makefile 193744 2009-06-08 19:57:35Z bz $
 
 KMOD=	ng_gif
 SRCS= 	ng_gif.c opt_inet.h opt_inet6.h

Modified: trunk/sys/modules/netgraph/gif_demux/Makefile
===================================================================
--- trunk/sys/modules/netgraph/gif_demux/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/gif_demux/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/gif_demux/Makefile 84004 2001-09-27 03:14:17Z brooks $
 
 KMOD=	ng_gif_demux
 SRCS= 	ng_gif_demux.c

Modified: trunk/sys/modules/netgraph/hole/Makefile
===================================================================
--- trunk/sys/modules/netgraph/hole/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/hole/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/hole/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_hole

Modified: trunk/sys/modules/netgraph/hub/Makefile
===================================================================
--- trunk/sys/modules/netgraph/hub/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/hub/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/hub/Makefile 128355 2004-04-17 12:42:17Z ru $
 
 KMOD=	ng_hub
 SRCS=	ng_hub.c

Modified: trunk/sys/modules/netgraph/iface/Makefile
===================================================================
--- trunk/sys/modules/netgraph/iface/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/iface/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/iface/Makefile 151350 2005-10-14 23:30:17Z yar $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_iface

Modified: trunk/sys/modules/netgraph/ip_input/Makefile
===================================================================
--- trunk/sys/modules/netgraph/ip_input/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/ip_input/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/ip_input/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 KMOD=	ng_ip_input
 SRCS= 	ng_ip_input.c

Modified: trunk/sys/modules/netgraph/ipfw/Makefile
===================================================================
--- trunk/sys/modules/netgraph/ipfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/ipfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/ipfw/Makefile 225586 2011-09-15 12:28:17Z ae $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/netgraph/ksocket/Makefile
===================================================================
--- trunk/sys/modules/netgraph/ksocket/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/ksocket/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/ksocket/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 KMOD=	ng_ksocket
 SRCS= 	ng_ksocket.c

Modified: trunk/sys/modules/netgraph/l2tp/Makefile
===================================================================
--- trunk/sys/modules/netgraph/l2tp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/l2tp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/l2tp/Makefile 102197 2002-08-20 22:03:57Z archie $
 
 KMOD=	ng_l2tp
 SRCS= 	ng_l2tp.c

Modified: trunk/sys/modules/netgraph/lmi/Makefile
===================================================================
--- trunk/sys/modules/netgraph/lmi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/lmi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/lmi/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_lmi

Modified: trunk/sys/modules/netgraph/mppc/Makefile
===================================================================
--- trunk/sys/modules/netgraph/mppc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/mppc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,14 +1,14 @@
+# $MidnightBSD$
 # $Whistle: Makefile,v 1.1 1999/12/08 20:20:39 archie Exp $
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/mppc/Makefile 302061 2016-06-21 15:47:54Z pfg $
 
 KMOD=	ng_mppc
 SRCS= 	ng_mppc.c opt_netgraph.h
 
-NETGRAPH_MPPC_COMPRESSION?=	0
+NETGRAPH_MPPC_COMPRESSION?=	1
 NETGRAPH_MPPC_ENCRYPTION?=	1
 
 .if ${NETGRAPH_MPPC_COMPRESSION} > 0
-# XXX These files don't exist yet, but hopefully someday they will...
 .PATH: ${.CURDIR}/../../../net
 SRCS+=	mppcc.c mppcd.c
 .endif

Modified: trunk/sys/modules/netgraph/nat/Makefile
===================================================================
--- trunk/sys/modules/netgraph/nat/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/nat/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/nat/Makefile 145937 2005-05-05 23:41:21Z glebius $
 
 KMOD=	ng_nat
 SRCS= 	ng_nat.c

Modified: trunk/sys/modules/netgraph/netflow/Makefile
===================================================================
--- trunk/sys/modules/netgraph/netflow/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/netflow/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/netflow/Makefile 232921 2012-03-13 11:08:40Z melifaro $
 #
 # Author: Gleb Smirnoff <glebius at freebsd.org>
 #

Modified: trunk/sys/modules/netgraph/netgraph/Makefile
===================================================================
--- trunk/sys/modules/netgraph/netgraph/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/netgraph/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/netgraph/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	netgraph

Modified: trunk/sys/modules/netgraph/one2many/Makefile
===================================================================
--- trunk/sys/modules/netgraph/one2many/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/one2many/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/one2many/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 KMOD=	ng_one2many
 SRCS= 	ng_one2many.c

Modified: trunk/sys/modules/netgraph/patch/Makefile
===================================================================
--- trunk/sys/modules/netgraph/patch/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/patch/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/patch/Makefile 208946 2010-06-09 12:25:57Z ae $
 
 KMOD=	ng_patch
 SRCS= 	ng_patch.c

Modified: trunk/sys/modules/netgraph/pipe/Makefile
===================================================================
--- trunk/sys/modules/netgraph/pipe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/pipe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/pipe/Makefile 194683 2009-06-23 06:11:04Z zec $
 
 KMOD=	ng_pipe
 SRCS= 	ng_pipe.c

Modified: trunk/sys/modules/netgraph/ppp/Makefile
===================================================================
--- trunk/sys/modules/netgraph/ppp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/ppp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/ppp/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.1 1999/01/24 02:52:12 archie Exp $
 
 KMOD=	ng_ppp

Modified: trunk/sys/modules/netgraph/pppoe/Makefile
===================================================================
--- trunk/sys/modules/netgraph/pppoe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/pppoe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/pppoe/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_pppoe

Modified: trunk/sys/modules/netgraph/pptpgre/Makefile
===================================================================
--- trunk/sys/modules/netgraph/pptpgre/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/pptpgre/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/pptpgre/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.1 1999/11/29 23:14:33 archie Exp $
 
 KMOD=	ng_pptpgre

Modified: trunk/sys/modules/netgraph/pred1/Makefile
===================================================================
--- trunk/sys/modules/netgraph/pred1/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/pred1/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/pred1/Makefile 165629 2006-12-29 13:16:43Z glebius $
 
 KMOD=		ng_pred1
 SRCS= 		ng_pred1.c

Modified: trunk/sys/modules/netgraph/rfc1490/Makefile
===================================================================
--- trunk/sys/modules/netgraph/rfc1490/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/rfc1490/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/rfc1490/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_rfc1490

Modified: trunk/sys/modules/netgraph/sample/Makefile
===================================================================
--- trunk/sys/modules/netgraph/sample/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/sample/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/sample/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 KMOD=	ng_sample
 SRCS= 	ng_sample.c

Modified: trunk/sys/modules/netgraph/socket/Makefile
===================================================================
--- trunk/sys/modules/netgraph/socket/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/socket/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/socket/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_socket

Modified: trunk/sys/modules/netgraph/source/Makefile
===================================================================
--- trunk/sys/modules/netgraph/source/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/source/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/source/Makefile 106266 2002-10-31 23:03:09Z julian $
 
 KMOD=		ng_source
 SRCS= 		ng_source.c

Modified: trunk/sys/modules/netgraph/split/Makefile
===================================================================
--- trunk/sys/modules/netgraph/split/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/split/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/split/Makefile 89260 2002-01-11 15:49:02Z ru $
 #
 
 KMOD=	ng_split

Modified: trunk/sys/modules/netgraph/sppp/Makefile
===================================================================
--- trunk/sys/modules/netgraph/sppp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/sppp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/sppp/Makefile 127376 2004-03-24 17:24:01Z rik $
 # Cronyx Id: ng_sppp.Makefile,v 1.1.2.1 2002/12/25 08:37:25 rik Exp $
 
 KMOD=	ng_sppp

Modified: trunk/sys/modules/netgraph/tag/Makefile
===================================================================
--- trunk/sys/modules/netgraph/tag/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/tag/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/tag/Makefile 159979 2006-06-27 12:45:28Z glebius $
 
 KMOD=	ng_tag
 SRCS= 	ng_tag.c

Modified: trunk/sys/modules/netgraph/tcpmss/Makefile
===================================================================
--- trunk/sys/modules/netgraph/tcpmss/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/tcpmss/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/tcpmss/Makefile 147232 2005-06-10 08:05:13Z glebius $
 
 KMOD=	ng_tcpmss
 SRCS= 	ng_tcpmss.c

Modified: trunk/sys/modules/netgraph/tee/Makefile
===================================================================
--- trunk/sys/modules/netgraph/tee/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/tee/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/tee/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_tee

Modified: trunk/sys/modules/netgraph/tty/Makefile
===================================================================
--- trunk/sys/modules/netgraph/tty/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/tty/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/tty/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_tty

Modified: trunk/sys/modules/netgraph/vjc/Makefile
===================================================================
--- trunk/sys/modules/netgraph/vjc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/vjc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/vjc/Makefile 89260 2002-01-11 15:49:02Z ru $
 # $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $
 
 .PATH: ${.CURDIR}/../../../net

Modified: trunk/sys/modules/netgraph/vlan/Makefile
===================================================================
--- trunk/sys/modules/netgraph/vlan/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netgraph/vlan/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netgraph/vlan/Makefile 126447 2004-03-01 17:22:16Z ru $
 
 KMOD=	ng_vlan
 SRCS=	ng_vlan.c

Modified: trunk/sys/modules/netmap/Makefile
===================================================================
--- trunk/sys/modules/netmap/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/netmap/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/netmap/Makefile 272648 2014-10-06 14:39:45Z luigi $
 #
 # Compile netmap as a module, useful if you want a netmap bridge
 # or loadable drivers.
@@ -5,10 +6,17 @@
 
 .PATH: ${.CURDIR}/../../dev/netmap
 .PATH.h: ${.CURDIR}/../../net
+CFLAGS += -I${.CURDIR}/../../
 KMOD	= netmap
 SRCS	= device_if.h bus_if.h opt_netmap.h
 SRCS	+= netmap.c netmap.h netmap_kern.h
+SRCS	+= netmap_mem2.c netmap_mem2.h
+SRCS	+= netmap_generic.c
+SRCS	+= netmap_mbq.c netmap_mbq.h
+SRCS	+= netmap_vale.c
+SRCS	+= netmap_freebsd.c
+SRCS	+= netmap_offloadings.c
+SRCS	+= netmap_pipe.c
+SRCS	+= netmap_monitor.c
 
-netmap.o: netmap_mem2.c
-
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/nfe/Makefile
===================================================================
--- trunk/sys/modules/nfe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfe/Makefile 163962 2006-11-03 21:41:19Z ru $
 
 .PATH: ${.CURDIR}/../../dev/nfe
 

Modified: trunk/sys/modules/nfs_common/Makefile
===================================================================
--- trunk/sys/modules/nfs_common/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfs_common/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfs_common/Makefile 203968 2010-02-16 20:00:21Z marius $
 
 .PATH: ${.CURDIR}/../../nfs
 

Modified: trunk/sys/modules/nfscl/Makefile
===================================================================
--- trunk/sys/modules/nfscl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfscl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfscl/Makefile 223483 2011-06-23 20:31:52Z uqs $
 
 .PATH: ${.CURDIR}/../../fs/nfsclient ${.CURDIR}/../../nfs
 KMOD=	nfscl

Modified: trunk/sys/modules/nfsclient/Makefile
===================================================================
--- trunk/sys/modules/nfsclient/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfsclient/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfsclient/Makefile 221032 2011-04-25 22:22:51Z rmacklem $
 
 .PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
 

Modified: trunk/sys/modules/nfscommon/Makefile
===================================================================
--- trunk/sys/modules/nfscommon/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfscommon/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfscommon/Makefile 223483 2011-06-23 20:31:52Z uqs $
 
 .PATH: ${.CURDIR}/../../fs/nfs 
 KMOD=	nfscommon

Modified: trunk/sys/modules/nfsd/Makefile
===================================================================
--- trunk/sys/modules/nfsd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfsd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfsd/Makefile 249596 2013-04-17 22:42:43Z ken $
 
 .PATH: ${.CURDIR}/../../fs/nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsd

Modified: trunk/sys/modules/nfslock/Makefile
===================================================================
--- trunk/sys/modules/nfslock/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfslock/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfslock/Makefile 210455 2010-07-24 22:11:11Z rmacklem $
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfslock

Modified: trunk/sys/modules/nfslockd/Makefile
===================================================================
--- trunk/sys/modules/nfslockd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfslockd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfslockd/Makefile 197730 2009-10-03 12:22:12Z nyan $
 
 .PATH: ${.CURDIR}/../../nlm ${.CURDIR}/../../rpc
 KMOD=	nfslockd
@@ -19,6 +20,7 @@
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
 .endif
+
 .endif
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/nfsserver/Makefile
===================================================================
--- trunk/sys/modules/nfsserver/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfsserver/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nfsserver/Makefile 249596 2013-04-17 22:42:43Z ken $
 
 .PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsserver

Modified: trunk/sys/modules/nfssvc/Makefile
===================================================================
--- trunk/sys/modules/nfssvc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nfssvc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/nfssvc/Makefile 190971 2009-04-12 19:04:27Z rmacklem $
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfssvc

Modified: trunk/sys/modules/nge/Makefile
===================================================================
--- trunk/sys/modules/nge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nge/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/nge
 

Modified: trunk/sys/modules/nmdm/Makefile
===================================================================
--- trunk/sys/modules/nmdm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nmdm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nmdm/Makefile 181905 2008-08-20 08:31:58Z ed $
 
 .PATH: ${.CURDIR}/../../dev/nmdm
 

Modified: trunk/sys/modules/nsp/Makefile
===================================================================
--- trunk/sys/modules/nsp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nsp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/nsp/Makefile,v 1.3 2005/09/27 18:10:37 mlaier Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nsp/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/nsp
 

Modified: trunk/sys/modules/ntfs/Makefile
===================================================================
--- trunk/sys/modules/ntfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ntfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../fs/ntfs

Modified: trunk/sys/modules/ntfs_iconv/Makefile
===================================================================
--- trunk/sys/modules/ntfs_iconv/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ntfs_iconv/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../../fs/ntfs

Modified: trunk/sys/modules/nullfs/Makefile
===================================================================
--- trunk/sys/modules/nullfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nullfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nullfs/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH: ${.CURDIR}/../../fs/nullfs
 

Modified: trunk/sys/modules/nvd/Makefile
===================================================================
--- trunk/sys/modules/nvd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nvd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: release/9.2.0/sys/modules/nvd/Makefile 240619 2012-09-17 19:58:02Z jimharris $
+# $FreeBSD: stable/10/sys/modules/nvd/Makefile 240619 2012-09-17 19:58:02Z jimharris $
 
 .PATH: ${.CURDIR}/../../dev/nvd
 

Modified: trunk/sys/modules/nve/Makefile
===================================================================
--- trunk/sys/modules/nve/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nve/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nve/Makefile 228861 2011-12-24 13:36:28Z dim $
 
 .PATH: ${.CURDIR}/../../dev/nve
 

Modified: trunk/sys/modules/nvme/Makefile
===================================================================
--- trunk/sys/modules/nvme/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nvme/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: release/9.2.0/sys/modules/nvme/Makefile 253631 2013-07-24 22:48:29Z jimharris $
+# $FreeBSD: stable/10/sys/modules/nvme/Makefile 253476 2013-07-19 21:40:57Z jimharris $
 
 .PATH: ${.CURDIR}/../../dev/nvme
 

Modified: trunk/sys/modules/nvram/Makefile
===================================================================
--- trunk/sys/modules/nvram/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nvram/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nvram/Makefile 172998 2007-10-26 03:23:54Z peter $
 
 .PATH: ${.CURDIR}/../../dev/nvram
 

Modified: trunk/sys/modules/nwfs/Makefile
===================================================================
--- trunk/sys/modules/nwfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nwfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../fs/nwfs

Modified: trunk/sys/modules/nxge/Makefile
===================================================================
--- trunk/sys/modules/nxge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/nxge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/nxge/Makefile 242731 2012-11-08 01:35:02Z kevlo $
 
 .PATH: ${.CURDIR}/../../dev/nxge
-VPATH = ${.CURDIR}/../../dev/nxge/xgehal
+.PATH: ${.CURDIR}/../../dev/nxge/xgehal
 
 CFLAGS_NXGE = 
 

Modified: trunk/sys/modules/oce/Makefile
===================================================================
--- trunk/sys/modules/oce/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/oce/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,10 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/oce/Makefile 284045 2015-06-05 20:38:22Z jhb $
 #
 
 .PATH:	${.CURDIR}/../../dev/oce
-KMOD	= oce
+KMOD	= if_oce
 SRCS    = oce_if.c oce_hw.c oce_mbox.c oce_util.c oce_queue.c oce_sysctl.c
 SRCS    += bus_if.h device_if.h pci_if.h opt_inet.h opt_inet6.h
 

Modified: trunk/sys/modules/opensolaris/Makefile
===================================================================
--- trunk/sys/modules/opensolaris/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/opensolaris/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $MidnightBSD: src/sys/modules/opensolaris/Makefile,v 1.2 2012/04/10 19:39:40 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/opensolaris/Makefile 253996 2013-08-06 15:51:56Z avg $
 
 .PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
 
@@ -27,3 +28,5 @@
 IGNORE_PRAGMA=	1
 
 .include <bsd.kmod.mk>
+
+CFLAGS+=	-include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h

Modified: trunk/sys/modules/padlock/Makefile
===================================================================
--- trunk/sys/modules/padlock/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/padlock/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/padlock/Makefile,v 1.3 2007/03/21 17:37:13 sam Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/padlock/Makefile 167771 2007-03-21 17:37:13Z sam $
 
 .PATH: ${.CURDIR}/../../crypto/via
 

Modified: trunk/sys/modules/patm/Makefile
===================================================================
--- trunk/sys/modules/patm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/patm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/patm/Makefile 182668 2008-09-01 23:59:00Z imp $
 #
 # Author: Harti Brandt <harti at freebsd.org>
 #

Modified: trunk/sys/modules/pccard/Makefile
===================================================================
--- trunk/sys/modules/pccard/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pccard/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pccard/Makefile 150363 2005-09-20 06:48:55Z imp $
 
 .PATH: ${.CURDIR}/../../dev/pccard
 

Modified: trunk/sys/modules/pcfclock/Makefile
===================================================================
--- trunk/sys/modules/pcfclock/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pcfclock/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pcfclock/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 

Modified: trunk/sys/modules/pcn/Makefile
===================================================================
--- trunk/sys/modules/pcn/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pcn/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pcn/Makefile 181740 2008-08-14 20:34:46Z imp $
 
 .PATH: ${.CURDIR}/../../dev/pcn
 

Modified: trunk/sys/modules/pf/Makefile
===================================================================
--- trunk/sys/modules/pf/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pf/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,19 +1,16 @@
-# $MidnightBSD: src/sys/modules/pf/Makefile,v 1.3 2009/01/16 04:49:24 laffer1 Exp $
-# $FreeBSD: src/sys/modules/pf/Makefile,v 1.13 2007/07/03 12:46:06 mlaier Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pf/Makefile 240494 2012-09-14 11:51:49Z glebius $
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../contrib/pf/net
-.PATH: ${.CURDIR}/../../contrib/pf/netinet
+.PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pf
 SRCS=	pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
-	pf_ruleset.c \
-	in4_cksum.c \
+	pf_ruleset.c in4_cksum.c \
+	bus_if.h device_if.h \
 	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h
 
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
-
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET_SUPPORT} != "no"
 opt_inet.h:
@@ -34,7 +31,6 @@
 	echo "#define DEV_PF 1" > ${.TARGET}
 	echo "#define DEV_PFLOG 1" >> ${.TARGET}
 	echo "#define DEV_PFSYNC 1" >> ${.TARGET}
-	echo "#define DEV_PFLOW 1" >> ${.TARGET}
 
 .if defined(VIMAGE)
 opt_global.h:

Modified: trunk/sys/modules/pflog/Makefile
===================================================================
--- trunk/sys/modules/pflog/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pflog/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,14 +1,13 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pflog/Makefile 240494 2012-09-14 11:51:49Z glebius $
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../contrib/pf/net
+.PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pflog
 SRCS=	if_pflog.c \
 	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
-
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
 SRCS+=	bus_if.h device_if.h
 
 .if defined(KERNBUILDDIR)

Modified: trunk/sys/modules/pfsync/Makefile
===================================================================
--- trunk/sys/modules/pfsync/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pfsync/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,14 +1,13 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pfsync/Makefile 240494 2012-09-14 11:51:49Z glebius $
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../contrib/pf/net
+.PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pfsync
 SRCS=	if_pfsync.c \
 	opt_pf.h opt_inet.h opt_inet6.h
-
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
 SRCS+=	bus_if.h device_if.h
 
 .if defined(KERNBUILDDIR)

Modified: trunk/sys/modules/plip/Makefile
===================================================================
--- trunk/sys/modules/plip/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/plip/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/plip/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	plip

Modified: trunk/sys/modules/portalfs/Makefile
===================================================================
--- trunk/sys/modules/portalfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/portalfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../fs/portalfs

Modified: trunk/sys/modules/ppbus/Makefile
===================================================================
--- trunk/sys/modules/ppbus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ppbus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ppbus/Makefile 122894 2003-11-19 05:08:27Z imp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppbus

Modified: trunk/sys/modules/ppc/Makefile
===================================================================
--- trunk/sys/modules/ppc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ppc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ppc/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH:	${.CURDIR}/../../dev/ppc
 KMOD=	ppc
@@ -11,8 +12,14 @@
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
+.if ${MACHINE} != "pc98"
 SRCS+=	ppc_acpi.c
+.endif
 SRCS+=	ppc_isa.c
 .endif
 
+.if ${MACHINE_CPUARCH} == "ia64"
+SRCS+=	ppc_acpi.c
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/ppi/Makefile
===================================================================
--- trunk/sys/modules/ppi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ppi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/ppi/Makefile 122894 2003-11-19 05:08:27Z imp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppi

Modified: trunk/sys/modules/pps/Makefile
===================================================================
--- trunk/sys/modules/pps/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pps/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/pps/Makefile 122894 2003-11-19 05:08:27Z imp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	pps

Modified: trunk/sys/modules/procfs/Makefile
===================================================================
--- trunk/sys/modules/procfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/procfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/procfs/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../fs/procfs
 

Modified: trunk/sys/modules/pseudofs/Makefile
===================================================================
--- trunk/sys/modules/pseudofs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pseudofs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pseudofs/Makefile 293595 2016-01-09 18:02:08Z dchagin $
 
 .PATH: ${.CURDIR}/../../fs/pseudofs
 
@@ -23,4 +24,10 @@
 		pfs_enable	\
 		pfs_destroy
 
+.if !defined(KERNBUILDDIR)
+.if defined(PSEUDOFS_TRACE)
+CFLAGS+=-DPSEUDOFS_TRACE
+.endif
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/pst/Makefile
===================================================================
--- trunk/sys/modules/pst/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pst/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pst/Makefile 119571 2003-08-30 08:01:05Z sos $
 
 .PATH: ${.CURDIR}/../../dev/pst
 

Modified: trunk/sys/modules/pty/Makefile
===================================================================
--- trunk/sys/modules/pty/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/pty/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/pty/Makefile 196480 2009-08-23 20:26:09Z ed $
 
 .PATH: ${.CURDIR}/../../dev/pty
 

Modified: trunk/sys/modules/puc/Makefile
===================================================================
--- trunk/sys/modules/puc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/puc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/puc/Makefile 158124 2006-04-28 21:21:53Z marcel $
 
 .PATH:	${.CURDIR}/../../dev/puc
 

Modified: trunk/sys/modules/qlxgb/Makefile
===================================================================
--- trunk/sys/modules/qlxgb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/qlxgb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2010-2011 Qlogic Corporation
 # All rights reserved.
@@ -26,7 +27,7 @@
 # File : Makefile
 # Author : David C Somayajulu, Qlogic Corporation, Aliso Viejo, CA 92656.
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/qlxgb/Makefile 227064 2011-11-03 21:20:22Z bz $
 #
 
 .PATH: ${.CURDIR}/../../dev/qlxgb

Modified: trunk/sys/modules/ral/Makefile
===================================================================
--- trunk/sys/modules/ral/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ral/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ral/Makefile 235233 2012-05-10 17:41:16Z bschmidt $
 
 .PATH: ${.CURDIR}/../../dev/ral
 

Modified: trunk/sys/modules/ralfw/Makefile
===================================================================
--- trunk/sys/modules/ralfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ralfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ralfw/Makefile 232946 2012-03-13 21:25:25Z bschmidt $
 
 SUBDIR=	rt2561 rt2561s rt2661 rt2860
 

Modified: trunk/sys/modules/ralfw/Makefile.inc
===================================================================
--- trunk/sys/modules/ralfw/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ralfw/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/ralfw/Makefile.inc 178354 2008-04-20 20:35:46Z sam $
 
 #
 # Common rules for building firmware.  Note this gets auto-included


Property changes on: trunk/sys/modules/ralfw/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/ralfw/rt2561/Makefile
===================================================================
--- trunk/sys/modules/ralfw/rt2561/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ralfw/rt2561/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ralfw/rt2561/Makefile 178354 2008-04-20 20:35:46Z sam $
 
 IMG=	rt2561
 

Modified: trunk/sys/modules/ralfw/rt2561s/Makefile
===================================================================
--- trunk/sys/modules/ralfw/rt2561s/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ralfw/rt2561s/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ralfw/rt2561s/Makefile 178354 2008-04-20 20:35:46Z sam $
 
 IMG=	rt2561s
 

Modified: trunk/sys/modules/ralfw/rt2661/Makefile
===================================================================
--- trunk/sys/modules/ralfw/rt2661/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ralfw/rt2661/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ralfw/rt2661/Makefile 178354 2008-04-20 20:35:46Z sam $
 
 IMG=	rt2661
 

Modified: trunk/sys/modules/ralfw/rt2860/Makefile
===================================================================
--- trunk/sys/modules/ralfw/rt2860/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ralfw/rt2860/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ralfw/rt2860/Makefile 232946 2012-03-13 21:25:25Z bschmidt $
 
 IMG=	rt2860
 

Modified: trunk/sys/modules/random/Makefile
===================================================================
--- trunk/sys/modules/random/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/random/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/sys/modules/random/Makefile 240950 2012-09-26 09:22:28Z kib $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/random/Makefile 314331 2017-02-27 10:22:16Z avg $
 
 .PATH: ${.CURDIR}/../../dev/random
 .PATH: ${.CURDIR}/../../crypto/rijndael
@@ -5,14 +6,15 @@
 .PATH: ${.CURDIR}/../../crypto/sha2
 
 KMOD=	random
-SRCS=	randomdev.c probe.c
+SRCS=	randomdev.c
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 SRCS+=	nehemiah.c
 SRCS+=	ivy.c
 .endif
 SRCS+=	randomdev_soft.c yarrow.c hash.c
-SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
-SRCS+=	bus_if.h device_if.h vnode_if.h opt_cpu.h
+SRCS+=	random_harvestq.c live_entropy_sources.c rwfile.c
+SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha256c.c sha512c.c
+SRCS+=	bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h
 
 CFLAGS+= -I${.CURDIR}/../..
 

Modified: trunk/sys/modules/rc/Makefile
===================================================================
--- trunk/sys/modules/rc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/rc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/rc/Makefile 181905 2008-08-20 08:31:58Z ed $
 
 .PATH: ${.CURDIR}/../../dev/rc
 

Modified: trunk/sys/modules/rc4/Makefile
===================================================================
--- trunk/sys/modules/rc4/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/rc4/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/rc4/Makefile 109318 2003-01-15 19:55:17Z sam $
 
 .PATH: ${.CURDIR}/../../crypto/rc4
 

Modified: trunk/sys/modules/rdma/Makefile
===================================================================
--- trunk/sys/modules/rdma/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/rdma/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,9 +1,6 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/rdma/Makefile 256820 2013-10-21 01:15:05Z np $
 
-SUBDIR=  addr
-SUBDIR+= cma
-SUBDIR+= iwcm
-SUBDIR+= core
 SUBDIR+= krping
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/rdma/krping/Makefile
===================================================================
--- trunk/sys/modules/rdma/krping/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/rdma/krping/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/rdma/krping/Makefile 237560 2012-06-25 09:46:06Z uqs $
 
 RDMA= ${.CURDIR}/../../../contrib/rdma/krping
 .PATH: ${RDMA}
@@ -5,8 +6,8 @@
 
 KMOD= krping
 SRCS= krping.c krping_dev.c getopt.c
-SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h
-SRCS+=  vnode_if.h
-CFLAGS+= -I${.CURDIR}/../../../ofed/include 
+SRCS+=  bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h
+SRCS+=  opt_sched.h opt_inet.h opt_inet6.h
+CFLAGS+= -I${.CURDIR}/../../../ofed/include
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/re/Makefile
===================================================================
--- trunk/sys/modules/re/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/re/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/re/Makefile,v 1.2 2003/09/08 03:24:29 wpaul Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/re/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/re
 

Modified: trunk/sys/modules/reiserfs/Makefile
===================================================================
--- trunk/sys/modules/reiserfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/reiserfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/reiserfs/Makefile 147476 2005-06-18 17:10:50Z dumbbell $
 
 .PATH: ${.CURDIR}/../../gnu/fs/reiserfs
 KMOD=	reiserfs

Modified: trunk/sys/modules/rl/Makefile
===================================================================
--- trunk/sys/modules/rl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/rl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/rl/Makefile 292780 2015-12-27 17:12:54Z marius $
 
-.PATH: ${.CURDIR}/../../pci
+.PATH: ${.CURDIR}/../../dev/rl
 
 KMOD=	if_rl
 SRCS=	if_rl.c device_if.h bus_if.h pci_if.h

Modified: trunk/sys/modules/rndtest/Makefile
===================================================================
--- trunk/sys/modules/rndtest/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/rndtest/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/rndtest/Makefile 112103 2003-03-11 19:26:16Z sam $
 
 .PATH:	${.CURDIR}/../../dev/rndtest
 KMOD	= rndtest

Modified: trunk/sys/modules/rp/Makefile
===================================================================
--- trunk/sys/modules/rp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/rp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/rp/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../dev/rp
 

Modified: trunk/sys/modules/runfw/Makefile
===================================================================
--- trunk/sys/modules/runfw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/runfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 KMOD=	runfw

Modified: trunk/sys/modules/s3/Makefile
===================================================================
--- trunk/sys/modules/s3/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/s3/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/s3/Makefile 71996 2001-02-04 12:35:22Z peter $
 
 .PATH: ${.CURDIR}/../../dev/fb
 

Modified: trunk/sys/modules/safe/Makefile
===================================================================
--- trunk/sys/modules/safe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/safe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 #-
 # Copyright (c) 2003 Sam Leffler, Errno Consulting
 # All rights reserved.
@@ -23,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/sys/modules/safe/Makefile,v 1.4 2007/03/21 03:42:50 sam Exp $
+# $FreeBSD: stable/10/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
 #
 
 .PATH:	${.CURDIR}/../../dev/safe

Modified: trunk/sys/modules/sbni/Makefile
===================================================================
--- trunk/sys/modules/sbni/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sbni/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sbni/Makefile 86752 2001-11-21 22:29:35Z fjoe $
 
 .PATH: ${.CURDIR}/../../dev/sbni
 

Modified: trunk/sys/modules/scc/Makefile
===================================================================
--- trunk/sys/modules/scc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/scc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/scc/Makefile 232176 2012-02-26 13:27:22Z jhibbits $
 
 .PATH: ${.CURDIR}/../../dev/scc
 

Modified: trunk/sys/modules/scd/Makefile
===================================================================
--- trunk/sys/modules/scd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/scd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/scd/Makefile 106449 2002-11-05 09:37:32Z mdodd $
 
 .PATH: ${.CURDIR}/../../dev/scd
 

Modified: trunk/sys/modules/scsi_low/Makefile
===================================================================
--- trunk/sys/modules/scsi_low/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/scsi_low/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/scsi_low/Makefile 240327 2012-09-10 21:57:40Z gnn $
 
 .PATH: ${.CURDIR}/../../cam/scsi
 KMOD=	scsi_low
-SRCS=	scsi_low.c scsi_low_pisa.c 
+SRCS=	scsi_low.c 
 SRCS+=  opt_ddb.h opt_scsi.h opt_cam.h bus_if.h device_if.h
 
 EXPORT_SYMS=	scsi_low_attach		\

Modified: trunk/sys/modules/sdhci/Makefile
===================================================================
--- trunk/sys/modules/sdhci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sdhci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sdhci/Makefile 241600 2012-10-16 01:10:43Z gonzo $
 
 .PATH: ${.CURDIR}/../../dev/sdhci
 
 KMOD=	sdhci
-SRCS=	sdhci.c sdhci.h device_if.h bus_if.h pci_if.h mmcbr_if.h
+SRCS=	sdhci.c sdhci.h sdhci_if.c sdhci_if.h device_if.h bus_if.h mmcbr_if.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/sem/Makefile
===================================================================
--- trunk/sys/modules/sem/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sem/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sem/Makefile 211339 2010-08-15 15:33:01Z kib $
 
 .PATH: ${.CURDIR}/../../kern
 

Modified: trunk/sys/modules/send/Makefile
===================================================================
--- trunk/sys/modules/send/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/send/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/send/Makefile 255174 2013-09-03 12:08:08Z uqs $
 .PATH: ${.CURDIR}/../../netinet6
 
 KMOD=	send
-SRCS=	send.c
+SRCS=	send.c opt_kdtrace.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/sf/Makefile
===================================================================
--- trunk/sys/modules/sf/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sf/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sf/Makefile 175521 2008-01-21 04:27:32Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/sf
 

Modified: trunk/sys/modules/sfxge/Makefile
===================================================================
--- trunk/sys/modules/sfxge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sfxge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,25 +1,60 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sfxge/Makefile 311500 2017-01-06 07:38:12Z arybchik $
 
+.include <bsd.own.mk>
+
 KMOD=	sfxge
 
 SFXGE= ${.CURDIR}/../../dev/sfxge
 
 SRCS=	device_if.h bus_if.h pci_if.h
-SRCS+=	opt_inet.h opt_zero.h opt_sched.h
+SRCS+=	opt_inet.h opt_inet6.h opt_sched.h
 
 .PATH: ${.CURDIR}/../../dev/sfxge
 SRCS+=	sfxge.c sfxge_dma.c sfxge_ev.c
-SRCS+=	sfxge_intr.c sfxge_mcdi.c
+SRCS+=	sfxge_intr.c sfxge_mcdi.c sfxge_nvram.c
 SRCS+=	sfxge_port.c sfxge_rx.c sfxge_tx.c
+SRCS+=	sfxge.h sfxge_rx.h sfxge_tx.h sfxge_version.h
 
 .PATH: ${.CURDIR}/../../dev/sfxge/common
-SRCS+=	efx_ev.c efx_intr.c efx_mac.c efx_mcdi.c efx_nic.c 
+SRCS+=	efx_bootcfg.c efx_crc32.c efx_ev.c efx_intr.c efx_lic.c efx_mac.c
+SRCS+=	efx_mcdi.c efx_mon.c efx_nic.c
 SRCS+=	efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tx.c
-SRCS+=	efx_vpd.c efx_wol.c
+SRCS+=	efx_vpd.c efx_filter.c efx_hash.c
+SRCS+=	efsys.h
+SRCS+=	efx.h efx_check.h efx_impl.h efx_mcdi.h efx_regs.h efx_regs_ef10.h
+SRCS+=	efx_regs_mcdi.h efx_regs_pci.h efx_types.h efx_phy_ids.h
+SRCS+=	ef10_tlv_layout.h
 
-SRCS+=	siena_mac.c siena_nic.c siena_nvram.c siena_phy.c
-SRCS+=	siena_sram.c siena_vpd.c 
+SRCS+=	mcdi_mon.c mcdi_mon.h
 
-DEBUG_FLAGS= -g -DDEBUG=1
+SRCS+=	siena_mac.c siena_mcdi.c siena_nic.c siena_nvram.c siena_phy.c
+SRCS+=	siena_sram.c siena_vpd.c
+SRCS+=	siena_flash.h siena_impl.h
 
+SRCS+=	ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c
+SRCS+=	ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c ef10_vpd.c
+SRCS+=	ef10_impl.h
+
+SRCS+=	hunt_nic.c
+SRCS+=	hunt_impl.h
+
+SRCS+=	medford_nic.c
+SRCS+=	medford_impl.h
+
+# Extra debug checks
+#CFLAGS += -DDEBUG=1
+
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	@echo "#define INET 1" > ${.TARGET}
+.endif
+
+.if ${MK_INET6_SUPPORT} != "no"
+opt_inet6.h:
+	@echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/sge/Makefile
===================================================================
--- trunk/sys/modules/sge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sge/Makefile 206625 2010-04-14 20:45:33Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/sge
 

Modified: trunk/sys/modules/siba_bwn/Makefile
===================================================================
--- trunk/sys/modules/siba_bwn/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/siba_bwn/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/siba_bwn/Makefile 203319 2010-01-31 21:18:22Z weongyo $
 
 .PATH: ${.CURDIR}/../../dev/siba
 

Modified: trunk/sys/modules/siftr/Makefile
===================================================================
--- trunk/sys/modules/siftr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/siftr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/siftr/Makefile 209662 2010-07-03 13:32:39Z lstewart $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/siis/Makefile
===================================================================
--- trunk/sys/modules/siis/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/siis/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/siis/Makefile 195801 2009-07-21 12:32:46Z mav $
 
 .PATH: ${.CURDIR}/../../dev/siis
 

Modified: trunk/sys/modules/sio/Makefile
===================================================================
--- trunk/sys/modules/sio/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sio/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sio/Makefile 225214 2011-08-27 14:24:27Z rwatson $
 
 .if ${MACHINE} == "pc98"
 .PATH: ${.CURDIR}/../../pc98/cbus

Modified: trunk/sys/modules/sis/Makefile
===================================================================
--- trunk/sys/modules/sis/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sis/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sis/Makefile 181524 2008-08-10 10:00:14Z imp $
 
 .PATH: ${.CURDIR}/../../dev/sis
 

Modified: trunk/sys/modules/sk/Makefile
===================================================================
--- trunk/sys/modules/sk/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sk/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/sys/modules/sk/Makefile,v 1.14 2006/04/27 00:14:02 yongari Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sk/Makefile 158061 2006-04-27 00:14:02Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/sk
 

Modified: trunk/sys/modules/smbfs/Makefile
===================================================================
--- trunk/sys/modules/smbfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/smbfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/smbfs/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH:	${.CURDIR}/../../crypto/des \
 	${.CURDIR}/../../crypto/des/arch/${MACHINE_CPUARCH} \

Modified: trunk/sys/modules/sn/Makefile
===================================================================
--- trunk/sys/modules/sn/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sn/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sn/Makefile 129740 2004-05-26 00:53:10Z imp $
 
 .PATH: ${.CURDIR}/../../dev/sn
 

Modified: trunk/sys/modules/snc/Makefile
===================================================================
--- trunk/sys/modules/snc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/snc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/snc/Makefile 181391 2008-08-07 20:51:51Z imp $
 
 .PATH: ${.CURDIR}/../../dev/snc
 

Modified: trunk/sys/modules/snp/Makefile
===================================================================
--- trunk/sys/modules/snp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/snp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/snp/Makefile 184689 2008-11-05 15:04:03Z ed $
 
 .PATH: ${.CURDIR}/../../dev/snp
 

Modified: trunk/sys/modules/sound/Makefile
===================================================================
--- trunk/sys/modules/sound/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/Makefile,v 1.2 2004/07/16 03:58:46 tanimura Exp $
+# $FreeBSD: stable/10/sys/modules/sound/Makefile 132236 2004-07-16 04:00:08Z tanimura $
 
 SUBDIR =
 SUBDIR += sound

Modified: trunk/sys/modules/sound/Makefile.inc
===================================================================
--- trunk/sys/modules/sound/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/Makefile.inc,v 1.1 2000/07/04 23:32:01 cg Exp $
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/sound/Makefile.inc 62598 2000-07-04 23:32:15Z cg $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/sound/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/sound/driver/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/Makefile 232337 2012-03-01 13:10:18Z mav $
 
 .include <bsd.own.mk>
 

Modified: trunk/sys/modules/sound/driver/Makefile.inc
===================================================================
--- trunk/sys/modules/sound/driver/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/Makefile.inc,v 1.3 2001/04/08 21:50:41 obrien Exp $
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/sound/driver/Makefile.inc 75325 2001-04-08 21:50:41Z obrien $
 
 SRCS+=	ac97_if.h channel_if.h feeder_if.h mixer_if.h
 


Property changes on: trunk/sys/modules/sound/driver/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/sound/driver/ad1816/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/ad1816/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/ad1816/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/ad1816/Makefile,v 1.2 2001/01/06 14:00:15 obrien Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/ad1816/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 

Modified: trunk/sys/modules/sound/driver/ai2s/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/ai2s/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/ai2s/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/ai2s/Makefile 264375 2014-04-12 19:57:15Z andreast $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/macio
 
@@ -5,6 +6,6 @@
 KMOD=	snd_ai2s
 SRCS=	device_if.h bus_if.h ofw_bus_if.h
 SRCS+=	channel_if.h feeder_if.h mixer_if.h
-SRCS+=	snapper.c tumbler.c aoa.c i2s.c
+SRCS+=	onyx.c snapper.c tumbler.c aoa.c i2s.c
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/sound/driver/als4000/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/als4000/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/als4000/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/als4000/Makefile,v 1.2 2003/02/07 13:56:31 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/als4000/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/atiixp/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/atiixp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/atiixp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/atiixp/Makefile 152851 2005-11-27 03:29:59Z ariff $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/audiocs/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/audiocs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/audiocs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/audiocs/Makefile,v 1.1 2004/10/25 10:29:57 yongari Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/audiocs/Makefile 136944 2004-10-25 10:29:57Z yongari $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/sbus
 

Modified: trunk/sys/modules/sound/driver/cmi/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/cmi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/cmi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/cmi/Makefile 158979 2006-05-27 16:32:05Z netchild $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/cs4281/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/cs4281/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/cs4281/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/cs4281/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/cs4281/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/csa/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/csa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/csa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/csa/Makefile,v 1.4 2003/02/07 13:56:31 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/csa/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/davbus/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/davbus/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/davbus/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/davbus/Makefile 187692 2009-01-25 18:20:15Z nwhitehorn $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/macio
 

Modified: trunk/sys/modules/sound/driver/driver/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/driver/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/driver/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/driver/Makefile,v 1.4 2003/02/07 15:05:37 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/driver/Makefile 110502 2003-02-07 15:05:37Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound
 

Modified: trunk/sys/modules/sound/driver/ds1/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/ds1/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/ds1/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/ds1/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/ds1/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/emu10k1/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/emu10k1/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/emu10k1/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/emu10k1/Makefile 230915 2012-02-02 17:25:39Z joel $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/emu10kx/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/emu10kx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/emu10kx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/emu10kx/Makefile 230915 2012-02-02 17:25:39Z joel $
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_emu10kx

Modified: trunk/sys/modules/sound/driver/envy24/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/envy24/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/envy24/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/envy24/Makefile 162892 2006-09-30 18:12:33Z netchild $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/envy24ht/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/envy24ht/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/envy24ht/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/envy24ht/Makefile 162892 2006-09-30 18:12:33Z netchild $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/es137x/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/es137x/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/es137x/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/es137x/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/es137x/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/ess/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/ess/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/ess/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/ess/Makefile 158491 2006-05-12 18:05:35Z ariff $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 

Modified: trunk/sys/modules/sound/driver/fm801/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/fm801/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/fm801/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/fm801/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/fm801/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/hda/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/hda/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/hda/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/hda/Makefile 230130 2012-01-15 13:21:36Z mav $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci/hda
 

Modified: trunk/sys/modules/sound/driver/hdspe/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/hdspe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/hdspe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/hdspe/Makefile 232337 2012-03-01 13:10:18Z mav $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/ich/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/ich/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/ich/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/ich/Makefile,v 1.2 2003/02/07 13:56:32 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/ich/Makefile 245952 2013-01-26 22:08:21Z pfg $
 
 .PATH:		${.CURDIR}/../../../../dev/sound/pci
 KMOD		= snd_ich


Property changes on: trunk/sys/modules/sound/driver/ich/Makefile
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/sys/modules/sound/driver/maestro/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/maestro/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/maestro/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/maestro/Makefile,v 1.4 2005/01/26 16:29:07 imp Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/maestro/Makefile 140867 2005-01-26 16:29:07Z imp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/maestro3/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/maestro3/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/maestro3/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/maestro3/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/maestro3/Makefile 230898 2012-02-02 00:10:20Z pfg $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/mss/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/mss/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/mss/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/mss/Makefile,v 1.5 2002/11/06 13:46:59 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/mss/Makefile 106497 2002-11-06 13:47:00Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 

Modified: trunk/sys/modules/sound/driver/neomagic/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/neomagic/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/neomagic/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/neomagic/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/neomagic/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/sb16/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/sb16/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/sb16/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/sb16/Makefile,v 1.2 2001/01/06 14:00:20 obrien Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/sb16/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 

Modified: trunk/sys/modules/sound/driver/sb8/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/sb8/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/sb8/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/sb8/Makefile,v 1.2 2001/01/06 14:00:20 obrien Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/sb8/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 

Modified: trunk/sys/modules/sound/driver/sbc/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/sbc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/sbc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/sbc/Makefile,v 1.4 2002/11/06 13:46:59 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/sbc/Makefile 106497 2002-11-06 13:47:00Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 

Modified: trunk/sys/modules/sound/driver/solo/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/solo/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/solo/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/solo/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/solo/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/spicds/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/spicds/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/spicds/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/spicds/Makefile 162892 2006-09-30 18:12:33Z netchild $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/t4dwave/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/t4dwave/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/t4dwave/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/t4dwave/Makefile,v 1.3 2003/02/07 13:56:33 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/t4dwave/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/uaudio/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/uaudio/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/uaudio/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/sys/modules/sound/driver/uaudio/Makefile,v 1.2 2007/03/17 23:17:24 archite Exp $
-# $FreeBSD: src/sys/modules/sound/driver/uaudio/Makefile,v 1.3 2004/12/29 08:50:35 imp Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/driver/uaudio/Makefile 266485 2014-05-21 06:29:52Z hselasky $
 
 S=	${.CURDIR}/../../../..
 
@@ -8,6 +8,6 @@
 KMOD=	snd_uaudio
 SRCS=	bus_if.h device_if.h usb_if.h vnode_if.h
 SRCS+=	opt_usb.h opt_bus.h feeder_if.h channel_if.h usbdevs.h
-SRCS+=	uaudio.c uaudio_pcm.c
+SRCS+=	uaudio_pcm.c uaudio.c 
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/sound/driver/via8233/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/via8233/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/via8233/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/via8233/Makefile,v 1.2 2003/02/07 13:56:33 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/via8233/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/via82c686/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/via82c686/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/via82c686/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/via82c686/Makefile,v 1.3 2003/02/07 13:56:33 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/via82c686/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/driver/vibes/Makefile
===================================================================
--- trunk/sys/modules/sound/driver/vibes/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/driver/vibes/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/vibes/Makefile,v 1.4 2003/02/07 13:56:33 nyan Exp $
+# $FreeBSD: stable/10/sys/modules/sound/driver/vibes/Makefile 110498 2003-02-07 13:56:33Z nyan $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 

Modified: trunk/sys/modules/sound/sound/Makefile
===================================================================
--- trunk/sys/modules/sound/sound/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sound/sound/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sound/sound/Makefile 266576 2014-05-23 06:28:31Z hselasky $
 
 .PATH: ${.CURDIR}/../../../dev/sound
 .PATH: ${.CURDIR}/../../../dev/sound/pcm
@@ -44,7 +45,8 @@
 
 EXPORT_SYMS=	YES	# XXX evaluate
 
-.if ${MACHINE_CPUARCH} == "sparc64"
+.if ${MACHINE_CPUARCH} != "i386" && ${MACHINE_CPUARCH} != "amd64" && \
+    ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "pc98"
 # Create an empty opt_isa.h in order to keep kmod.mk from linking in an
 # existing one from KERNBUILDDIR which possibly has DEV_ISA defined so
 # sound.ko is always built without isadma support.

Modified: trunk/sys/modules/speaker/Makefile
===================================================================
--- trunk/sys/modules/speaker/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/speaker/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/speaker/Makefile 152306 2005-11-11 09:57:32Z ru $
 
 .PATH: ${.CURDIR}/../../dev/speaker
 

Modified: trunk/sys/modules/splash/Makefile
===================================================================
--- trunk/sys/modules/splash/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/splash/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/splash/Makefile 228445 2011-12-12 21:12:07Z eadler $
 
 SUBDIR=	bmp pcx txt
 

Modified: trunk/sys/modules/splash/Makefile.inc
===================================================================
--- trunk/sys/modules/splash/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/splash/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/splash/Makefile.inc 50477 1999-08-28 01:08:13Z peter $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/splash/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/splash/bmp/Makefile
===================================================================
--- trunk/sys/modules/splash/bmp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/splash/bmp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/splash/bmp/Makefile 133226 2004-08-06 20:37:08Z des $
 
 .PATH:	${.CURDIR}/../../../dev/fb
 

Modified: trunk/sys/modules/splash/pcx/Makefile
===================================================================
--- trunk/sys/modules/splash/pcx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/splash/pcx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/splash/pcx/Makefile 133226 2004-08-06 20:37:08Z des $
 
 .PATH:	${.CURDIR}/../../../dev/fb
 

Modified: trunk/sys/modules/splash/txt/Makefile
===================================================================
--- trunk/sys/modules/splash/txt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/splash/txt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/splash/txt/Makefile 228445 2011-12-12 21:12:07Z eadler $
 .PATH:	${.CURDIR}/../../../dev/fb
 
 KMOD=	splash_txt

Modified: trunk/sys/modules/sppp/Makefile
===================================================================
--- trunk/sys/modules/sppp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sppp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sppp/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net
 

Modified: trunk/sys/modules/ste/Makefile
===================================================================
--- trunk/sys/modules/ste/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ste/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ste/Makefile 181739 2008-08-14 20:09:58Z imp $
 
 .PATH: ${.CURDIR}/../../dev/ste
 

Modified: trunk/sys/modules/stg/Makefile
===================================================================
--- trunk/sys/modules/stg/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/stg/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/stg/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/stg
 

Modified: trunk/sys/modules/stge/Makefile
===================================================================
--- trunk/sys/modules/stge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/stge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/stge/Makefile 160642 2006-07-25 00:45:55Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/stge
 

Modified: trunk/sys/modules/streams/Makefile
===================================================================
--- trunk/sys/modules/streams/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/streams/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$ 
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/streams/Makefile 299215 2016-05-07 08:30:21Z dchagin $ 
 
 .PATH: ${.CURDIR}/../../dev/streams
 
@@ -5,10 +6,6 @@
 KMOD=	streams
 SRCS=	streams.c
 
-EXPORT_SYMS=	svr4_str_initialized	\
-		svr4_stream_get		\
-		svr4_delete_socket
-
 .if defined(DEBUG)
 CFLAGS+= -DDEBUG_SVR4
 .endif

Modified: trunk/sys/modules/svr4/Makefile
===================================================================
--- trunk/sys/modules/svr4/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/svr4/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/svr4/Makefile 299215 2016-05-07 08:30:21Z dchagin $
 
 .PATH:	${.CURDIR}/../../${MACHINE_CPUARCH}/svr4 ${.CURDIR}/../../compat/svr4
 KMOD=	svr4
@@ -8,6 +9,7 @@
 	svr4_termios.c svr4_stream.c svr4_socket.c svr4_sockio.c \
 	svr4_machdep.c svr4_resource.c svr4_ipc.c
 OBJS=	svr4_locore.o 
+EXPORT_SYMS= svr4_delete_socket
 
 SRCS+=	opt_ktrace.h opt_sysvipc.h
 

Modified: trunk/sys/modules/svr4/README
===================================================================
--- trunk/sys/modules/svr4/README	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/svr4/README	2018-05-26 21:14:14 UTC (rev 9983)
@@ -30,9 +30,10 @@
 It's early days yet, folks -- You'll probably have trouble getting 100%
 functionality out of most things (specifically, poll() on a socket doesn't
 look like it works at the moment, so Netscape doesn't work (among other
-things)).  Patches will be appreciated (use send-pr).
+things)).  Patches will be appreciated.
 
    - Mark Newton
      newton at atdot.dotat.org
 
-$FreeBSD$
+$FreeBSD: stable/10/sys/modules/svr4/README 267734 2014-06-22 16:48:21Z gavin $
+$MidnightBSD$


Property changes on: trunk/sys/modules/svr4/README
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/svr4/TO-DO
===================================================================
--- trunk/sys/modules/svr4/TO-DO	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/svr4/TO-DO	2018-05-26 21:14:14 UTC (rev 9983)
@@ -12,4 +12,5 @@
   * Make SysV emulator use SysV shared memory support (duh)
 
 
-$FreeBSD$
+$FreeBSD: stable/10/sys/modules/svr4/TO-DO 50477 1999-08-28 01:08:13Z peter $
+$MidnightBSD$


Property changes on: trunk/sys/modules/svr4/TO-DO
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/sym/Makefile
===================================================================
--- trunk/sys/modules/sym/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sym/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sym/Makefile 70711 2001-01-06 14:00:42Z obrien $
 
 .PATH: ${.CURDIR}/../../dev/sym
 

Modified: trunk/sys/modules/syscons/Makefile
===================================================================
--- trunk/sys/modules/syscons/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/Makefile 294783 2016-01-26 08:55:31Z des $
 
 SUBDIR=	${_apm} \
 	${_beastie} \
@@ -9,6 +10,7 @@
 	${_fire} \
 	green \
 	${_logo} \
+	${_plasma} \
 	${_rain} \
 	${_snake} \
 	${_star} \
@@ -25,6 +27,7 @@
 _dragon=	dragon
 _fire=		fire
 _logo=		logo
+_plasma=	plasma
 _rain=		rain
 _snake=		snake
 _star=		star

Modified: trunk/sys/modules/syscons/Makefile.inc
===================================================================
--- trunk/sys/modules/syscons/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/syscons/Makefile.inc 50477 1999-08-28 01:08:13Z peter $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/syscons/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/syscons/apm/Makefile
===================================================================
--- trunk/sys/modules/syscons/apm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/apm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/apm/Makefile 106497 2002-11-06 13:47:00Z nyan $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/apm
 

Modified: trunk/sys/modules/syscons/beastie/Makefile
===================================================================
--- trunk/sys/modules/syscons/beastie/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/beastie/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/beastie/Makefile 206380 2010-04-07 18:42:21Z jkim $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/logo
 

Modified: trunk/sys/modules/syscons/blank/Makefile
===================================================================
--- trunk/sys/modules/syscons/blank/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/blank/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/blank/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/blank
 

Modified: trunk/sys/modules/syscons/daemon/Makefile
===================================================================
--- trunk/sys/modules/syscons/daemon/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/daemon/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/daemon/Makefile 106497 2002-11-06 13:47:00Z nyan $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/daemon
 

Modified: trunk/sys/modules/syscons/dragon/Makefile
===================================================================
--- trunk/sys/modules/syscons/dragon/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/dragon/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/dragon/Makefile 106762 2002-11-11 10:11:59Z mux $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/dragon
 

Modified: trunk/sys/modules/syscons/fade/Makefile
===================================================================
--- trunk/sys/modules/syscons/fade/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/fade/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/fade/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/fade
 

Modified: trunk/sys/modules/syscons/fire/Makefile
===================================================================
--- trunk/sys/modules/syscons/fire/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/fire/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/fire/Makefile 106762 2002-11-11 10:11:59Z mux $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/fire
 

Modified: trunk/sys/modules/syscons/green/Makefile
===================================================================
--- trunk/sys/modules/syscons/green/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/green/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/green/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/green
 

Modified: trunk/sys/modules/syscons/logo/Makefile
===================================================================
--- trunk/sys/modules/syscons/logo/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/logo/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/logo/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/logo
 

Modified: trunk/sys/modules/syscons/rain/Makefile
===================================================================
--- trunk/sys/modules/syscons/rain/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/rain/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/rain/Makefile 106759 2002-11-11 10:07:18Z mux $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/rain
 

Modified: trunk/sys/modules/syscons/snake/Makefile
===================================================================
--- trunk/sys/modules/syscons/snake/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/snake/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/snake/Makefile 106497 2002-11-06 13:47:00Z nyan $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/snake
 

Modified: trunk/sys/modules/syscons/star/Makefile
===================================================================
--- trunk/sys/modules/syscons/star/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/star/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/star/Makefile 106497 2002-11-06 13:47:00Z nyan $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/star
 

Modified: trunk/sys/modules/syscons/warp/Makefile
===================================================================
--- trunk/sys/modules/syscons/warp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/syscons/warp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/syscons/warp/Makefile 106762 2002-11-11 10:11:59Z mux $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/warp
 

Modified: trunk/sys/modules/sysvipc/Makefile
===================================================================
--- trunk/sys/modules/sysvipc/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sysvipc/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sysvipc/Makefile 69487 2000-12-01 17:49:16Z alfred $
 
 SUBDIR= sysvmsg sysvsem sysvshm
 

Modified: trunk/sys/modules/sysvipc/Makefile.inc
===================================================================
--- trunk/sys/modules/sysvipc/Makefile.inc	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sysvipc/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
-# $FreeBSD$
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/sysvipc/Makefile.inc 106496 2002-11-06 13:41:40Z nyan $
 
 .include "../Makefile.inc"


Property changes on: trunk/sys/modules/sysvipc/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/modules/sysvipc/sysvmsg/Makefile
===================================================================
--- trunk/sys/modules/sysvipc/sysvmsg/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sysvipc/sysvmsg/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sysvipc/sysvmsg/Makefile 213781 2010-10-13 14:44:38Z rpaulo $
 
 .PATH: ${.CURDIR}/../../../kern
 

Modified: trunk/sys/modules/sysvipc/sysvsem/Makefile
===================================================================
--- trunk/sys/modules/sysvipc/sysvsem/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sysvipc/sysvsem/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sysvipc/sysvsem/Makefile 213781 2010-10-13 14:44:38Z rpaulo $
 
 .PATH: ${.CURDIR}/../../../kern
 

Modified: trunk/sys/modules/sysvipc/sysvshm/Makefile
===================================================================
--- trunk/sys/modules/sysvipc/sysvshm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/sysvipc/sysvshm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/sysvipc/sysvshm/Makefile 193588 2009-06-06 17:01:44Z rwatson $
 
 .PATH: ${.CURDIR}/../../../kern
 

Modified: trunk/sys/modules/ti/Makefile
===================================================================
--- trunk/sys/modules/ti/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ti/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,8 +1,9 @@
-# $FreeBSD: src/sys/modules/ti/Makefile,v 1.17 2005/12/10 00:38:32 scottl Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ti/Makefile 255608 2013-09-16 06:25:54Z kib $
 
 .PATH: ${.CURDIR}/../../dev/ti
 
 KMOD=	if_ti
-SRCS=	if_ti.c device_if.h bus_if.h pci_if.h opt_ti.h opt_zero.h
+SRCS=	if_ti.c device_if.h bus_if.h pci_if.h opt_ti.h
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/tl/Makefile
===================================================================
--- trunk/sys/modules/tl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/tl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/tl/Makefile 181738 2008-08-14 20:02:34Z imp $
 
 .PATH: ${.CURDIR}/../../dev/tl
 

Modified: trunk/sys/modules/tmpfs/Makefile
===================================================================
--- trunk/sys/modules/tmpfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/tmpfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/tmpfs/Makefile 171087 2007-06-29 05:23:15Z delphij $
 
 .PATH: ${.CURDIR}/../../fs/tmpfs
 

Modified: trunk/sys/modules/tpm/Makefile
===================================================================
--- trunk/sys/modules/tpm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/tpm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/tpm/Makefile 211270 2010-08-13 04:00:35Z takawata $
 
 .PATH:	${.CURDIR}/../../dev/tpm
 

Modified: trunk/sys/modules/trm/Makefile
===================================================================
--- trunk/sys/modules/trm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/trm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/trm/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../dev/trm
 

Modified: trunk/sys/modules/twa/Makefile
===================================================================
--- trunk/sys/modules/twa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/twa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/twa/Makefile 169400 2007-05-09 04:16:32Z scottl $
 #
 # Copyright (c) 2004-06 Applied Micro Circuits Corporation.
 # All rights reserved.

Modified: trunk/sys/modules/twe/Makefile
===================================================================
--- trunk/sys/modules/twe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/twe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/twe/Makefile 148913 2005-08-10 04:01:21Z obrien $
 
 KMOD=	twe
 .PATH: ${.CURDIR}/../../dev/${KMOD}

Modified: trunk/sys/modules/tws/Makefile
===================================================================
--- trunk/sys/modules/tws/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/tws/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 # Makefile for tws (LSI 3ware 9750 SAS2/SATA-II RAID PCIe) driver
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/tws/Makefile 226026 2011-10-04 21:40:25Z delphij $
 
 KMOD=	tws
 .PATH:	${.CURDIR}/../../dev/${KMOD}

Modified: trunk/sys/modules/tx/Makefile
===================================================================
--- trunk/sys/modules/tx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/tx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/tx/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/tx
 

Modified: trunk/sys/modules/txp/Makefile
===================================================================
--- trunk/sys/modules/txp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/txp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/txp/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/txp
 

Modified: trunk/sys/modules/uart/Makefile
===================================================================
--- trunk/sys/modules/uart/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/uart/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,24 +1,40 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/uart/Makefile 249765 2013-04-22 13:02:41Z nyan $
 
 .PATH: ${.CURDIR}/../../dev/uart
 
 .if ${MACHINE_CPUARCH} == "sparc64"
 uart_bus_ebus=	uart_bus_ebus.c
+.endif
+
+.if ${MACHINE_CPUARCH} == "arm"
+uart_dev_lpc=	uart_dev_lpc.c
+.endif
+
+.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "sparc64"
 ofw_bus_if=	ofw_bus_if.h
 .endif
 
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
+_uart_cpu=uart_cpu_x86.c
+.else
+_uart_cpu=uart_cpu_${MACHINE}.c
+.endif
+.if exists(${.CURDIR:H:H}/dev/uart/${_uart_cpu})
+uart_cpu_machine= ${_uart_cpu}
+.endif
+
 KMOD=	uart
 SRCS=	uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
 	uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \
-	uart_core.c uart_dbg.c \
-	uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \
+	uart_core.c ${uart_cpu_machine} uart_dbg.c \
+	${uart_dev_lpc} uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \
 	uart_dev_z8530.c \
 	uart_if.c uart_if.h uart_subr.c uart_tty.c
-.if exists(${.CURDIR}/../../dev/uart/uart_cpu_${MACHINE}.c)
-SRCS+=	uart_cpu_${MACHINE}.c
-.endif
+
 SRCS+=	bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
 	power_if.h pccarddevs.h serdev_if.h
+SRCS+=	opt_platform.h
 
 MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
 	dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \

Modified: trunk/sys/modules/ubsec/Makefile
===================================================================
--- trunk/sys/modules/ubsec/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ubsec/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ubsec/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH:	${.CURDIR}/../../dev/ubsec
 KMOD	= ubsec

Modified: trunk/sys/modules/ubser/Makefile
===================================================================
--- trunk/sys/modules/ubser/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ubser/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ubser/Makefile 198041 2009-10-13 18:07:56Z jhb $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb/serial

Modified: trunk/sys/modules/uchcom/Makefile
===================================================================
--- trunk/sys/modules/uchcom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/uchcom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/uchcom/Makefile 172748 2007-10-18 10:51:06Z takawata $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb

Modified: trunk/sys/modules/ucycom/Makefile
===================================================================
--- trunk/sys/modules/ucycom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ucycom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ucycom/Makefile 139399 2004-12-29 08:50:35Z imp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb

Modified: trunk/sys/modules/udf/Makefile
===================================================================
--- trunk/sys/modules/udf/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/udf/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/udf/Makefile 124472 2004-01-13 11:28:51Z ru $
 
 .PATH: ${.CURDIR}/../../fs/udf
 

Modified: trunk/sys/modules/udf_iconv/Makefile
===================================================================
--- trunk/sys/modules/udf_iconv/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/udf_iconv/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/udf_iconv/Makefile 122221 2003-11-07 09:38:05Z scottl $
 
 .PATH:	${.CURDIR}/../../fs/udf
 KMOD=	udf_iconv

Modified: trunk/sys/modules/ufs/Makefile
===================================================================
--- trunk/sys/modules/ufs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/ufs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/ufs/Makefile 267494 2014-06-15 05:15:38Z kib $
 
 .PATH:	${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs
 
@@ -6,9 +7,9 @@
 SRCS=	opt_ddb.h opt_directio.h opt_ffs.h opt_quota.h opt_suiddir.h opt_ufs.h \
 	vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \
 	ufs_gjournal.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \
-	ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c \
-	ffs_softdep.c ffs_subr.c ffs_suspend.c ffs_tables.c ffs_vfsops.c \
-	ffs_vnops.c
+	ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_rawread.c \
+	ffs_snapshot.c ffs_softdep.c ffs_subr.c ffs_suspend.c ffs_tables.c \
+	ffs_vfsops.c ffs_vnops.c
 
 .if !defined(KERNBUILDDIR)
 CFLAGS+= -DSOFTUPDATES -DUFS_DIRHASH

Modified: trunk/sys/modules/unionfs/Makefile
===================================================================
--- trunk/sys/modules/unionfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/unionfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/unionfs/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH: ${.CURDIR}/../../fs/unionfs
 

Modified: trunk/sys/modules/usb/Makefile
===================================================================
--- trunk/sys/modules/usb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/Makefile 273882 2014-10-31 07:33:56Z hselasky $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #
@@ -31,20 +32,37 @@
 # MK_SOURCELESS_UCODE option (see below).
 
 SUBDIR = usb
-SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
-SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw}
-SUBDIR += atp uhid ukbd ums udbp ufm uep
+SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} \
+	  ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw}
+SUBDIR += ${_rum} ${_run} ${_runfw} ${_uath} upgt usie ural ${_zyd} ${_urtw} 
+SUBDIR += ${_urtwn} ${_urtwnfw}
+SUBDIR += atp uhid ukbd ums udbp ufm uep wsp uled
 SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
 	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
-SUBDIR += uether aue axe cdce cue ${_kue} mos rue udav uhso ipheth
+SUBDIR += uether aue axe axge cdce cue ${_kue} mos rue smsc udav uhso ipheth
+SUBDIR += urndis
 SUBDIR += usfs umass urio
 SUBDIR += quirk template
+SUBDIR += ${_g_audio} ${_g_keyboard} ${_g_modem} ${_g_mouse}
 
+.if ${MK_USB_GADGET_EXAMPLES} == "yes"
+_g_audio=	g_audio
+_g_keyboard=	g_keyboard
+_g_modem=	g_modem
+_g_mouse=	g_mouse
+.endif
+
 .if ${MK_SOURCELESS_UCODE} != "no"
 _rum=		rum
 _uath=		uath
 _zyd=		zyd
 _kue=		kue
+_urtwn=		urtwn
+_urtwnfw=	urtwnfw
+_run=		run
+_runfw=		runfw
+_rsu=		rsu
+_rsufw=		rsufw
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
@@ -54,6 +72,9 @@
 .if ${MACHINE_CPUARCH} == "arm"
 _at91dci=	at91dci
 _atmegadci=	atmegadci
+_dwc_otg=	dwc_otg
+_musb=		musb
+_uss820dci=	uss820dci
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"

Modified: trunk/sys/modules/usb/at91dci/Makefile
===================================================================
--- trunk/sys/modules/usb/at91dci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/at91dci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/at91dci/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/atmegadci/Makefile
===================================================================
--- trunk/sys/modules/usb/atmegadci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/atmegadci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/atmegadci/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/atp/Makefile
===================================================================
--- trunk/sys/modules/usb/atp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/atp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/atp/Makefile 199086 2009-11-09 15:59:09Z rpaulo $
 
 S=     ${.CURDIR}/../../..
 

Modified: trunk/sys/modules/usb/aue/Makefile
===================================================================
--- trunk/sys/modules/usb/aue/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/aue/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/aue/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/avr32dci/Makefile
===================================================================
--- trunk/sys/modules/usb/avr32dci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/avr32dci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/avr32dci/Makefile 228483 2011-12-14 00:28:54Z hselasky $
 #
 # Copyright (c) 2011 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/axe/Makefile
===================================================================
--- trunk/sys/modules/usb/axe/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/axe/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/axe/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/cdce/Makefile
===================================================================
--- trunk/sys/modules/usb/cdce/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/cdce/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/cdce/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/cue/Makefile
===================================================================
--- trunk/sys/modules/usb/cue/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/cue/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/cue/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ehci/Makefile
===================================================================
--- trunk/sys/modules/usb/ehci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ehci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ehci/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ipheth/Makefile
===================================================================
--- trunk/sys/modules/usb/ipheth/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ipheth/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ipheth/Makefile 213805 2010-10-13 21:36:42Z hselasky $
 #
 # Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/kue/Makefile
===================================================================
--- trunk/sys/modules/usb/kue/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/kue/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/kue/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/mos/Makefile
===================================================================
--- trunk/sys/modules/usb/mos/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/mos/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/mos/Makefile 218729 2011-02-16 08:33:30Z hselasky $
 #
 # Copyright (c) 2011 Rick van der Zwet <info at rickvanderzwet.nl>
 #

Modified: trunk/sys/modules/usb/musb/Makefile
===================================================================
--- trunk/sys/modules/usb/musb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/musb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/musb/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ohci/Makefile
===================================================================
--- trunk/sys/modules/usb/ohci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ohci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ohci/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/quirk/Makefile
===================================================================
--- trunk/sys/modules/usb/quirk/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/quirk/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/quirk/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/rue/Makefile
===================================================================
--- trunk/sys/modules/usb/rue/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/rue/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/rue/Makefile 226154 2011-10-08 12:33:10Z marius $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/rum/Makefile
===================================================================
--- trunk/sys/modules/usb/rum/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/rum/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/rum/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/run/Makefile
===================================================================
--- trunk/sys/modules/usb/run/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/run/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/run/Makefile 203134 2010-01-28 22:24:54Z thompsa $
 #
 # Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/template/Makefile
===================================================================
--- trunk/sys/modules/usb/template/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/template/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/template/Makefile 269922 2014-08-13 08:21:52Z hselasky $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #
@@ -38,6 +39,7 @@
 	usb_template_modem.c \
 	usb_template_mouse.c \
 	usb_template_msc.c \
-	usb_template_mtp.c
+	usb_template_mtp.c \
+	usb_template_phone.c
 
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/usb/u3g/Makefile
===================================================================
--- trunk/sys/modules/usb/u3g/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/u3g/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/u3g/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uark/Makefile
===================================================================
--- trunk/sys/modules/usb/uark/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uark/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uark/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uath/Makefile
===================================================================
--- trunk/sys/modules/usb/uath/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uath/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uath/Makefile 190688 2009-04-04 11:23:00Z weongyo $
 
 .PATH: ${.CURDIR}/../../../dev/usb/wlan
 

Modified: trunk/sys/modules/usb/ubsa/Makefile
===================================================================
--- trunk/sys/modules/usb/ubsa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ubsa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ubsa/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ubser/Makefile
===================================================================
--- trunk/sys/modules/usb/ubser/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ubser/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ubser/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uchcom/Makefile
===================================================================
--- trunk/sys/modules/usb/uchcom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uchcom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uchcom/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ucom/Makefile
===================================================================
--- trunk/sys/modules/usb/ucom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ucom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ucom/Makefile 198258 2009-10-19 21:54:41Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ucycom/Makefile
===================================================================
--- trunk/sys/modules/usb/ucycom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ucycom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ucycom/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/udav/Makefile
===================================================================
--- trunk/sys/modules/usb/udav/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/udav/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/udav/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/udbp/Makefile
===================================================================
--- trunk/sys/modules/usb/udbp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/udbp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/udbp/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uep/Makefile
===================================================================
--- trunk/sys/modules/usb/uep/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uep/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uep/Makefile 208554 2010-05-25 21:20:56Z glebius $
 
 S=     ${.CURDIR}/../../..
 

Modified: trunk/sys/modules/usb/uether/Makefile
===================================================================
--- trunk/sys/modules/usb/uether/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uether/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uether/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ufm/Makefile
===================================================================
--- trunk/sys/modules/usb/ufm/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ufm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ufm/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ufoma/Makefile
===================================================================
--- trunk/sys/modules/usb/ufoma/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ufoma/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ufoma/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uftdi/Makefile
===================================================================
--- trunk/sys/modules/usb/uftdi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uftdi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uftdi/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ugensa/Makefile
===================================================================
--- trunk/sys/modules/usb/ugensa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ugensa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ugensa/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uhci/Makefile
===================================================================
--- trunk/sys/modules/usb/uhci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uhci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uhci/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uhid/Makefile
===================================================================
--- trunk/sys/modules/usb/uhid/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uhid/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uhid/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uhso/Makefile
===================================================================
--- trunk/sys/modules/usb/uhso/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uhso/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uhso/Makefile 202181 2010-01-13 03:16:31Z thompsa $
 #
 # Copyright (c) 2010 Andrew Thompson. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uipaq/Makefile
===================================================================
--- trunk/sys/modules/usb/uipaq/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uipaq/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uipaq/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ukbd/Makefile
===================================================================
--- trunk/sys/modules/usb/ukbd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ukbd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ukbd/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Added: trunk/sys/modules/usb/uled/Makefile
===================================================================
--- trunk/sys/modules/usb/uled/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/uled/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,37 @@
+# $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/usb/uled/Makefile 271159 2014-09-05 11:25:58Z kevlo $
+#
+# Copyright (c) 2014 Kevin Lo. 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.
+#
+
+S=     ${.CURDIR}/../../..
+
+.PATH: $S/dev/usb/misc
+
+KMOD=	uled
+SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
+	uled.c
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/usb/uled/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/modules/usb/ulpt/Makefile
===================================================================
--- trunk/sys/modules/usb/ulpt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ulpt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ulpt/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/umass/Makefile
===================================================================
--- trunk/sys/modules/usb/umass/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/umass/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
-#
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/usb/umass/Makefile 249213 2013-04-06 19:12:49Z marius $
+#
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/sys/modules/usb/umcs/Makefile
===================================================================
--- trunk/sys/modules/usb/umcs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/umcs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/umcs/Makefile 222696 2011-06-04 20:40:24Z hselasky $
 #
 # Copyright (c) 2011 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/umct/Makefile
===================================================================
--- trunk/sys/modules/usb/umct/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/umct/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/umct/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/umodem/Makefile
===================================================================
--- trunk/sys/modules/usb/umodem/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/umodem/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/umodem/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/umoscom/Makefile
===================================================================
--- trunk/sys/modules/usb/umoscom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/umoscom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/umoscom/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ums/Makefile
===================================================================
--- trunk/sys/modules/usb/ums/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ums/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ums/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/upgt/Makefile
===================================================================
--- trunk/sys/modules/usb/upgt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/upgt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/upgt/Makefile 191983 2009-05-11 02:39:49Z weongyo $
 
 .PATH: ${.CURDIR}/../../../dev/usb/wlan
 

Modified: trunk/sys/modules/usb/uplcom/Makefile
===================================================================
--- trunk/sys/modules/usb/uplcom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uplcom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uplcom/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/ural/Makefile
===================================================================
--- trunk/sys/modules/usb/ural/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/ural/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/ural/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/urio/Makefile
===================================================================
--- trunk/sys/modules/usb/urio/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/urio/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
-#
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/usb/urio/Makefile 249213 2013-04-06 19:12:49Z marius $
+#
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Added: trunk/sys/modules/usb/urndis/Makefile
===================================================================
--- trunk/sys/modules/usb/urndis/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/urndis/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,38 @@
+# $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/usb/urndis/Makefile 261541 2014-02-06 08:47:14Z hselasky $
+#
+# Copyright (c) 2014 Hans Petter Selasky. 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.
+#
+
+S=     ${.CURDIR}/../../..
+
+.PATH: $S/dev/usb/net
+
+KMOD=	if_urndis
+SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \
+	miibus_if.h opt_inet.h \
+	if_urndis.c
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/usb/urndis/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/modules/usb/urtw/Makefile
===================================================================
--- trunk/sys/modules/usb/urtw/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/urtw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/urtw/Makefile 192873 2009-05-27 03:57:38Z weongyo $
 
 .PATH: ${.CURDIR}/../../../dev/usb/wlan
 

Added: trunk/sys/modules/usb/urtwn/Makefile
===================================================================
--- trunk/sys/modules/usb/urtwn/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/urtwn/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,11 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/urtwn/Makefile 251538 2013-06-08 16:02:31Z rpaulo $
+
+.PATH: ${.CURDIR}/../../../dev/usb/wlan
+
+KMOD    = if_urtwn
+SRCS    = if_urtwn.c if_urtwnreg.h \
+	  bus_if.h device_if.h \
+	  opt_bus.h opt_usb.h usb_if.h usbdevs.h
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/usb/urtwn/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sys/modules/usb/urtwnfw/Makefile
===================================================================
--- trunk/sys/modules/usb/urtwnfw/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/urtwnfw/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,6 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/urtwnfw/Makefile 266578 2014-05-23 06:47:47Z hselasky $
+
+SUBDIR=	urtwnrtl8188eu urtwnrtl8192cT urtwnrtl8192cU
+
+.include <bsd.subdir.mk>


Property changes on: trunk/sys/modules/usb/urtwnfw/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sys/modules/usb/urtwnfw/Makefile.inc
===================================================================
--- trunk/sys/modules/usb/urtwnfw/Makefile.inc	                        (rev 0)
+++ trunk/sys/modules/usb/urtwnfw/Makefile.inc	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,16 @@
+/* $MidnightBSD$ */
+# $FreeBSD: stable/10/sys/modules/usb/urtwnfw/Makefile.inc 253139 2013-07-10 08:21:09Z hiren $
+#
+# Common rules for building firmware.  Note this gets auto-included
+# by the subdir Makefile's as a consequence of included bsd.kmod.mk.
+
+_FIRM=	${IMG}.fw
+
+CLEANFILES+=	${_FIRM}
+
+FIRMWS=	${_FIRM}:${KMOD}:111
+
+FIRMWARE_LICENSE=	realtek
+
+${_FIRM}: ${.CURDIR}/../../../../contrib/dev/urtwn/${_FIRM}.uu
+	uudecode -p $? > ${.TARGET}


Property changes on: trunk/sys/modules/usb/urtwnfw/Makefile.inc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile
===================================================================
--- trunk/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,7 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile 264912 2014-04-25 08:01:22Z kevlo $
+
+KMOD=	urtwn-rtl8188eufw
+IMG=	urtwn-rtl8188eufw
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile
===================================================================
--- trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,7 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile 253139 2013-07-10 08:21:09Z hiren $
+
+KMOD=	urtwn-rtl8192cfwT
+IMG=	urtwn-rtl8192cfwT
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile
===================================================================
--- trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,7 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile 253139 2013-07-10 08:21:09Z hiren $
+
+KMOD=	urtwn-rtl8192cfwU
+IMG=	urtwn-rtl8192cfwU
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/modules/usb/usb/Makefile
===================================================================
--- trunk/sys/modules/usb/usb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/usb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/usb/Makefile 215649 2010-11-22 01:11:28Z weongyo $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/usfs/Makefile
===================================================================
--- trunk/sys/modules/usb/usfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/usfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,6 +1,7 @@
-#
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/usb/usfs/Makefile 249213 2013-04-06 19:12:49Z marius $
+#
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/sys/modules/usb/usie/Makefile
===================================================================
--- trunk/sys/modules/usb/usie/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/usie/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/usie/Makefile 223864 2011-07-08 10:58:56Z hselasky $
 #
 # Copyright (c) 2011 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uslcom/Makefile
===================================================================
--- trunk/sys/modules/usb/uslcom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uslcom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uslcom/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uss820dci/Makefile
===================================================================
--- trunk/sys/modules/usb/uss820dci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uss820dci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uss820dci/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uvisor/Makefile
===================================================================
--- trunk/sys/modules/usb/uvisor/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uvisor/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uvisor/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/uvscom/Makefile
===================================================================
--- trunk/sys/modules/usb/uvscom/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/uvscom/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/uvscom/Makefile 188943 2009-02-23 18:32:59Z thompsa $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Added: trunk/sys/modules/usb/wsp/Makefile
===================================================================
--- trunk/sys/modules/usb/wsp/Makefile	                        (rev 0)
+++ trunk/sys/modules/usb/wsp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,37 @@
+# $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/usb/wsp/Makefile 261260 2014-01-29 10:42:01Z hselasky $
+#
+# Copyright (c) 2012 Huang Wen Hui. 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.
+#
+
+S=     ${.CURDIR}/../../..
+
+.PATH: $S/dev/usb/input
+
+KMOD=	wsp
+SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
+	wsp.c
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/usb/wsp/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/modules/usb/xhci/Makefile
===================================================================
--- trunk/sys/modules/usb/xhci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/xhci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/xhci/Makefile 213437 2010-10-04 23:22:03Z hselasky $
 #
 # Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/usb/zyd/Makefile
===================================================================
--- trunk/sys/modules/usb/zyd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/usb/zyd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/modules/usb/zyd/Makefile 193422 2009-06-04 03:59:20Z weongyo $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #

Modified: trunk/sys/modules/utopia/Makefile
===================================================================
--- trunk/sys/modules/utopia/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/utopia/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/utopia/Makefile 142445 2005-02-25 09:49:29Z harti $
 
 .PATH: ${.CURDIR}/../../dev/utopia
 

Modified: trunk/sys/modules/vesa/Makefile
===================================================================
--- trunk/sys/modules/vesa/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vesa/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vesa/Makefile 198251 2009-10-19 20:58:10Z jkim $
 
 KMOD=	vesa
 SRCS=	opt_vga.h opt_vesa.h

Modified: trunk/sys/modules/vge/Makefile
===================================================================
--- trunk/sys/modules/vge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vge/Makefile 150636 2005-09-27 18:10:43Z mlaier $
 
 .PATH: ${.CURDIR}/../../dev/vge
 

Modified: trunk/sys/modules/viawd/Makefile
===================================================================
--- trunk/sys/modules/viawd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/viawd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/viawd/Makefile 228431 2011-12-12 09:50:33Z fabient $
 
 .PATH: ${.CURDIR}/../../dev/viawd
 

Modified: trunk/sys/modules/virtio/Makefile
===================================================================
--- trunk/sys/modules/virtio/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/virtio/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,7 @@
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/virtio/Makefile 275273 2014-11-29 22:48:40Z bryanv $
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -22,7 +24,6 @@
 # SUCH DAMAGE.
 #
 
-# XXX: scsi
-SUBDIR=	virtio pci network block balloon
+SUBDIR=	virtio pci network block balloon scsi random console
 
 .include <bsd.subdir.mk>

Modified: trunk/sys/modules/virtio/balloon/Makefile
===================================================================
--- trunk/sys/modules/virtio/balloon/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/virtio/balloon/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,7 @@
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/virtio/balloon/Makefile 227652 2011-11-18 05:43:43Z grehan $
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:

Modified: trunk/sys/modules/virtio/block/Makefile
===================================================================
--- trunk/sys/modules/virtio/block/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/virtio/block/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,7 @@
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/virtio/block/Makefile 227652 2011-11-18 05:43:43Z grehan $
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:

Added: trunk/sys/modules/virtio/console/Makefile
===================================================================
--- trunk/sys/modules/virtio/console/Makefile	                        (rev 0)
+++ trunk/sys/modules/virtio/console/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,37 @@
+# $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/virtio/console/Makefile 273515 2014-10-23 04:47:32Z bryanv $
+#
+# 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.
+#
+
+.PATH: ${.CURDIR}/../../../dev/virtio/console
+
+KMOD=	virtio_console
+SRCS=	virtio_console.c
+SRCS+=	virtio_bus_if.h virtio_if.h
+SRCS+=	bus_if.h device_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m \
+	dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/virtio/console/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/modules/virtio/network/Makefile
===================================================================
--- trunk/sys/modules/virtio/network/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/virtio/network/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,7 @@
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/virtio/network/Makefile 255112 2013-09-01 04:33:47Z bryanv $
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -22,6 +24,8 @@
 # SUCH DAMAGE.
 #
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../../dev/virtio/network
 
 KMOD=	if_vtnet
@@ -28,8 +32,21 @@
 SRCS=	if_vtnet.c
 SRCS+=	virtio_bus_if.h virtio_if.h
 SRCS+=	bus_if.h device_if.h 
+SRCS+=	opt_inet.h opt_inet6.h
 
 MFILES=	kern/bus_if.m kern/device_if.m \
 	dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m
 
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	@echo "#define INET 1" > ${.TARGET}
+.endif
+
+.if ${MK_INET6_SUPPORT} != "no"
+opt_inet6.h:
+	@echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
+
 .include <bsd.kmod.mk>

Modified: trunk/sys/modules/virtio/pci/Makefile
===================================================================
--- trunk/sys/modules/virtio/pci/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/virtio/pci/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,7 @@
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/virtio/pci/Makefile 227652 2011-11-18 05:43:43Z grehan $
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:

Added: trunk/sys/modules/virtio/random/Makefile
===================================================================
--- trunk/sys/modules/virtio/random/Makefile	                        (rev 0)
+++ trunk/sys/modules/virtio/random/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,37 @@
+# $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/virtio/random/Makefile 260847 2014-01-18 06:14:38Z bryanv $
+#
+# 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.
+#
+
+.PATH: ${.CURDIR}/../../../dev/virtio/random
+
+KMOD=	virtio_random
+SRCS=	virtio_random.c
+SRCS+=	virtio_bus_if.h virtio_if.h
+SRCS+=	bus_if.h device_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m \
+	dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/virtio/random/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/modules/virtio/scsi/Makefile
===================================================================
--- trunk/sys/modules/virtio/scsi/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/virtio/scsi/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,7 @@
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/virtio/scsi/Makefile 241470 2012-10-11 23:41:18Z grehan $
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:

Modified: trunk/sys/modules/virtio/virtio/Makefile
===================================================================
--- trunk/sys/modules/virtio/virtio/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/virtio/virtio/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,7 @@
 # $MidnightBSD$
 #
+# $FreeBSD: stable/10/sys/modules/virtio/virtio/Makefile 227652 2011-11-18 05:43:43Z grehan $
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:

Modified: trunk/sys/modules/vkbd/Makefile
===================================================================
--- trunk/sys/modules/vkbd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vkbd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.1.1.3 2012-07-21 15:16:45 laffer1 Exp $
-# $FreeBSD$
+# $MidnightBSD$
+# $Id: Makefile,v 1.1 2004/08/13 18:30:24 max Exp $
+# $FreeBSD: stable/10/sys/modules/vkbd/Makefile 162711 2006-09-27 19:57:02Z ru $
 
 .PATH:	${.CURDIR}/../../dev/vkbd
 

Added: trunk/sys/modules/vmm/Makefile
===================================================================
--- trunk/sys/modules/vmm/Makefile	                        (rev 0)
+++ trunk/sys/modules/vmm/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,88 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vmm/Makefile 284894 2015-06-27 22:48:22Z neel $
+
+KMOD=	vmm
+
+SRCS=	opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h
+SRCS+=	vmx_assym.h svm_assym.h
+DPSRCS=	vmx_genassym.c svm_genassym.c
+
+CFLAGS+= -DVMM_KEEP_STATS -DSMP
+CFLAGS+= -I${.CURDIR}/../../amd64/vmm
+CFLAGS+= -I${.CURDIR}/../../amd64/vmm/io
+CFLAGS+= -I${.CURDIR}/../../amd64/vmm/intel
+CFLAGS+= -I${.CURDIR}/../../amd64/vmm/amd
+
+# generic vmm support
+.PATH: ${.CURDIR}/../../amd64/vmm
+SRCS+=	vmm.c		\
+	vmm_dev.c	\
+	vmm_host.c	\
+	vmm_instruction_emul.c	\
+	vmm_ioport.c	\
+	vmm_ipi.c	\
+	vmm_lapic.c	\
+	vmm_mem.c	\
+	vmm_stat.c	\
+	vmm_util.c	\
+	x86.c		\
+	vmm_support.S
+
+.PATH: ${.CURDIR}/../../amd64/vmm/io
+SRCS+=	iommu.c		\
+	ppt.c           \
+	vatpic.c	\
+	vatpit.c	\
+	vhpet.c		\
+	vioapic.c	\
+	vlapic.c	\
+	vpmtmr.c	\
+	vrtc.c
+
+# intel-specific files
+.PATH: ${.CURDIR}/../../amd64/vmm/intel
+SRCS+=	ept.c		\
+	vmcs.c		\
+	vmx_msr.c	\
+	vmx_support.S	\
+	vmx.c		\
+	vtd.c
+
+# amd-specific files
+.PATH: ${.CURDIR}/../../amd64/vmm/amd
+SRCS+=	vmcb.c		\
+	svm.c		\
+	svm_support.S	\
+	npt.c		\
+	amdv.c		\
+	svm_msr.c
+
+CLEANFILES=	vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o
+
+vmx_assym.h:    vmx_genassym.o
+.if exists(@)
+vmx_assym.h:    @/kern/genassym.sh
+.endif
+	sh @/kern/genassym.sh vmx_genassym.o > ${.TARGET}
+
+svm_assym.h:    svm_genassym.o
+.if exists(@)
+svm_assym.h:    @/kern/genassym.sh
+.endif
+	sh @/kern/genassym.sh svm_genassym.o > ${.TARGET}
+
+vmx_support.o:
+	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
+	    ${.IMPSRC} -o ${.TARGET}
+
+svm_support.o:
+	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
+	    ${.IMPSRC} -o ${.TARGET}
+
+vmx_genassym.o:
+	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
+
+svm_genassym.o:
+	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/vmm/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sys/modules/vmware/Makefile
===================================================================
--- trunk/sys/modules/vmware/Makefile	                        (rev 0)
+++ trunk/sys/modules/vmware/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,29 @@
+# $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/vmware/Makefile 254738 2013-08-23 20:47:16Z bryanv $
+#
+# 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.
+#
+
+SUBDIR=	vmxnet3
+
+.include <bsd.subdir.mk>


Property changes on: trunk/sys/modules/vmware/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sys/modules/vmware/vmxnet3/Makefile
===================================================================
--- trunk/sys/modules/vmware/vmxnet3/Makefile	                        (rev 0)
+++ trunk/sys/modules/vmware/vmxnet3/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -0,0 +1,51 @@
+# $MidnightBSD$
+#
+# $FreeBSD: stable/10/sys/modules/vmware/vmxnet3/Makefile 264866 2014-04-24 04:43:50Z bryanv $
+#
+# 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.
+#
+
+.include <bsd.own.mk>
+
+.PATH: ${.CURDIR}/../../../dev/vmware/vmxnet3
+
+KMOD=	if_vmx
+SRCS=	if_vmx.c
+SRCS+=	bus_if.h device_if.h pci_if.h opt_inet.h opt_inet6.h
+
+# With VMXNET3_LEGACY_TX, the driver will use the non-multiqueue
+# capable if_start interface.
+#CFLAGS+= -DVMXNET3_LEGACY_TX
+
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	@echo "#define INET 1" > ${.TARGET}
+.endif
+
+.if ${MK_INET6_SUPPORT} != "no"
+opt_inet6.h:
+	@echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
+
+.include <bsd.kmod.mk>


Property changes on: trunk/sys/modules/vmware/vmxnet3/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/modules/vpo/Makefile
===================================================================
--- trunk/sys/modules/vpo/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vpo/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vpo/Makefile 89260 2002-01-11 15:49:02Z ru $
 
 .PATH: ${.CURDIR}/../../dev/ppbus
 

Modified: trunk/sys/modules/vr/Makefile
===================================================================
--- trunk/sys/modules/vr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vr/Makefile 177048 2008-03-11 03:50:57Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/vr
 

Modified: trunk/sys/modules/vte/Makefile
===================================================================
--- trunk/sys/modules/vte/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vte/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vte/Makefile 216829 2010-12-31 00:21:41Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/vte
 

Modified: trunk/sys/modules/vx/Makefile
===================================================================
--- trunk/sys/modules/vx/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vx/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vx/Makefile 211690 2010-08-23 06:13:29Z imp $
 
 .PATH: ${.CURDIR}/../../dev/vx
 

Modified: trunk/sys/modules/vxge/Makefile
===================================================================
--- trunk/sys/modules/vxge/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/vxge/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/vxge/Makefile 221167 2011-04-28 14:33:15Z gnn $
 
 .PATH: ${.CURDIR}/../../dev/vxge
 VPATH =	${.CURDIR}/../../dev/vxge/vxgehal

Modified: trunk/sys/modules/wb/Makefile
===================================================================
--- trunk/sys/modules/wb/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wb/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wb/Makefile 181741 2008-08-14 21:26:29Z imp $
 
 .PATH: ${.CURDIR}/../../dev/wb
 

Modified: trunk/sys/modules/wbwd/Makefile
===================================================================
--- trunk/sys/modules/wbwd/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wbwd/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wbwd/Makefile 232614 2012-03-06 18:44:52Z bz $
 
 .PATH: ${.CURDIR}/../../dev/wbwd
 

Modified: trunk/sys/modules/wlan/Makefile
===================================================================
--- trunk/sys/modules/wlan/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan/Makefile 262126 2014-02-17 20:19:34Z dim $
 
 .PATH: ${.CURDIR}/../../net80211
 
@@ -11,9 +12,10 @@
 	ieee80211_scan_sta.c ieee80211_radiotap.c ieee80211_ratectl.c \
 	ieee80211_ratectl_none.c ieee80211_regdomain.c \
 	ieee80211_ht.c ieee80211_hwmp.c ieee80211_adhoc.c ieee80211_hostap.c \
-	ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c
-SRCS+=	bus_if.h device_if.h opt_inet.h opt_inet6.h opt_ipx.h opt_wlan.h \
-	opt_ddb.h
+	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 \
+	opt_tdma.h opt_wlan.h
 
 .if !defined(KERNBUILDDIR)
 opt_wlan.h:
@@ -30,3 +32,10 @@
 .endif
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.ieee80211_adhoc.c=	-Wno-unused-function
+CWARNFLAGS.ieee80211_crypto.c=	-Wno-unused-function
+CWARNFLAGS.ieee80211_hostap.c=	-Wno-unused-function
+CWARNFLAGS.ieee80211_mesh.c=	-Wno-unused-function
+CWARNFLAGS.ieee80211_sta.c=	-Wno-unused-function
+CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}

Modified: trunk/sys/modules/wlan_acl/Makefile
===================================================================
--- trunk/sys/modules/wlan_acl/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan_acl/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan_acl/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net80211
 

Modified: trunk/sys/modules/wlan_amrr/Makefile
===================================================================
--- trunk/sys/modules/wlan_amrr/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan_amrr/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan_amrr/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net80211
 

Modified: trunk/sys/modules/wlan_ccmp/Makefile
===================================================================
--- trunk/sys/modules/wlan_ccmp/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan_ccmp/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan_ccmp/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net80211
 .PATH: ${.CURDIR}/../../crypto/rijndael

Modified: trunk/sys/modules/wlan_rssadapt/Makefile
===================================================================
--- trunk/sys/modules/wlan_rssadapt/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan_rssadapt/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan_rssadapt/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net80211
 

Modified: trunk/sys/modules/wlan_tkip/Makefile
===================================================================
--- trunk/sys/modules/wlan_tkip/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan_tkip/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan_tkip/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net80211
 

Modified: trunk/sys/modules/wlan_wep/Makefile
===================================================================
--- trunk/sys/modules/wlan_wep/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan_wep/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan_wep/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net80211
 

Modified: trunk/sys/modules/wlan_xauth/Makefile
===================================================================
--- trunk/sys/modules/wlan_xauth/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/wlan_xauth/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/wlan_xauth/Makefile 182668 2008-09-01 23:59:00Z imp $
 
 .PATH: ${.CURDIR}/../../net80211
 

Modified: trunk/sys/modules/xfs/Makefile
===================================================================
--- trunk/sys/modules/xfs/Makefile	2018-05-26 21:09:29 UTC (rev 9982)
+++ trunk/sys/modules/xfs/Makefile	2018-05-26 21:14:14 UTC (rev 9983)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../../gnu/fs/xfs \



More information about the Midnightbsd-cvs mailing list